diff --git a/app-accessibility/orca/orca-3.10.3.ebuild b/app-accessibility/orca/orca-3.10.3.ebuild
index 7d1ab670323b..506828d2f6c2 100644
--- a/app-accessibility/orca/orca-3.10.3.ebuild
+++ b/app-accessibility/orca/orca-3.10.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-accessibility/orca/orca-3.10.3.ebuild,v 1.1 2014/04/05 07:28:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.10.3.ebuild,v 1.3 2014/05/04 12:09:05 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 37b9b0f688d1..56cf8af4b83f 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1 @@
-DIST ansible-1.4.3.tar.gz 1011935 SHA256 bb9f2a63a0a88ab60b64c58e5e7fe9e1602d7bea22f3965e633fe87dfc87eaf5 SHA512 52b7efe63f0c6932ae829011e545ed0e71d15ded10aadfba37c0e8185d3fc9015468c63888426215e492942489bd791cce831564954fa168dfcce34387ce90f8 WHIRLPOOL a9119c1758fc2ac6fe059ee97dd6b8c38a182fb2547104934f3cd08d5a607dbdabae282d586f90a5a139f5341246f0e2241067feff836975b8eaf08e90ee66ac
-DIST ansible-1.4.5.tar.gz 1012349 SHA256 61c35aad0d4ef668051652b8a5b84b6407016a5b1daa74b982889ff0fafddea0 SHA512 b65f1eaac0ef749a0cb1592b5e26cb3004dcf9b49dbf35496e06fe59f58328d0c82fc01ca38c6276440b85f267fcf69006b14f585525ee5219e1868c18433fed WHIRLPOOL 70be758c77aca464a83368533011aaf2d2467a946879e154c9fd1e798ab02207c11de2a4dbaaa816aba3edb873fdeafc76a3975723b4837a2d1a2f19a5a42806
-DIST ansible-1.5.0.tar.gz 1024953 SHA256 9ac02f181f595a95c00cf1615b1166ba86149a7d1503a8c0e758165409d1e4be SHA512 cc0f0dedbaeaaad6d69448490bdbeae4fb100d31d5ee12d95823df5f11e093d8bedb7cc202e47915eeeffad2dce09cfee36b3937627c5637a1dfdc1daa290531 WHIRLPOOL 19e5194182da5b22dcdb70416459f5d0a7369d71703d62a3a924ccd2b4fbde5d5eb0f1581d4868d32310df2a2ad7a9d53aeb650d74fd15efeff7fbb9e647c932
-DIST ansible-1.5.3.tar.gz 1035118 SHA256 3b5351d7d27de4b02c77f79c093b18e76670da6ec1e78a456b5a11c196d757ed SHA512 5f2e6c33690f2d189ac89a49e3c79fd415ac30ff2352448f437e95d2aab9afa9bb33465c39b3692491cfca667a5904b2304237094482ad5578c763328c7f4fbc WHIRLPOOL e82071807e8fcfff2bd0a182c87f98dcfbc2cabaa73078e6b9aa253c2c41c6f82c8a8d042419eca4851782d5b2323af3c5a0130a766c926ed8f84a4ab4e75d43
 DIST ansible-1.5.5.tar.gz 1036131 SHA256 d8ed21d8b099a20f71ad13f7dd675d7e1a85c74dbee594ba3c39a53168d988a8 SHA512 500b0bb7525f5a10b23e7a58af24c416cebd236c213e070dc9b772ed835adca6967ce3a8eed911bde9a395aedc7b578f82026c2d68f00fe40817e37ba2237cf2 WHIRLPOOL befca112c34fa6ca9aefbf32be00b2280aefef3f665426ed1154a6e73a7a077d5e091a956b69fd1b931b271ad9adcb6859b5bbcb3a1b27682ae171faff2ba86f
diff --git a/app-admin/ansible/ansible-1.4.3.ebuild b/app-admin/ansible/ansible-1.4.3.ebuild
deleted file mode 100644
index 3ef4c3aad3c2..000000000000
--- a/app-admin/ansible/ansible-1.4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.4.3.ebuild,v 1.3 2014/03/03 12:29:22 pinkbyte Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/nose
-		dev-vcs/git
-	)"
-RDEPEND="
-	dev-python/jinja
-	dev-python/pyyaml
-	dev-python/paramiko
-	net-misc/sshpass
-	virtual/ssh
-"
-
-DOC_CONTENTS="You can define parameters through shell variables OR use config files
-Examples of config files installed in /usr/share/doc/${PF}/examples\n\n
-You have to create ansible hosts file!\n
-More info on http://docs.ansible.com/intro_getting_started.html"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	# Skip tests which need ssh access
-	sed -i 's:$(NOSETESTS) -d -v:\0 -e \\(TestPlayBook.py\\|TestRunner.py\\):' Makefile || die "sed failed"
-}
-
-python_test() {
-	make tests || die "tests failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-	# Hint: do not install example config files into /etc
-	# let this choice to user
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
diff --git a/app-admin/ansible/ansible-1.4.5.ebuild b/app-admin/ansible/ansible-1.4.5.ebuild
deleted file mode 100644
index bde43598008b..000000000000
--- a/app-admin/ansible/ansible-1.4.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.4.5.ebuild,v 1.2 2014/03/03 12:18:57 pinkbyte Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-
-DOC_CONTENTS="You can define parameters through shell variables OR use config files
-Examples of config files installed in /usr/share/doc/${PF}/examples\n\n
-You have to create ansible hosts file!\n
-More info on http://docs.ansible.com/intro_getting_started.html"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	# Skip tests which need ssh access
-	sed -i 's:$(NOSETESTS) -d -v:\0 -e \\(TestPlayBook.py\\|TestRunner.py\\):' Makefile || die "sed failed"
-}
-
-python_test() {
-	make tests || die "tests failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-	# Hint: do not install example config files into /etc
-	# let this choice to user
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
diff --git a/app-admin/ansible/ansible-1.5.0.ebuild b/app-admin/ansible/ansible-1.5.0.ebuild
deleted file mode 100644
index 16c010b0099c..000000000000
--- a/app-admin/ansible/ansible-1.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.5.0.ebuild,v 1.2 2014/03/17 10:07:49 pinkbyte Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-
-DOC_CONTENTS="You can define parameters through shell variables OR use config files
-Examples of config files installed in /usr/share/doc/${PF}/examples\n\n
-You have to create ansible hosts file!\n
-More info on http://docs.ansible.com/intro_getting_started.html
-
-Some optional dependencies, you might want to install:
-dev-python/keyczar - needed to support accelerated mode
-dev-python/paramiko - alternative SSH backend"
-
-python_test() {
-	make tests || die "tests failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-	# Hint: do not install example config files into /etc
-	# let this choice to user
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
diff --git a/app-admin/ansible/ansible-1.5.3.ebuild b/app-admin/ansible/ansible-1.5.3.ebuild
deleted file mode 100644
index ea8a6781658c..000000000000
--- a/app-admin/ansible/ansible-1.5.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.5.3.ebuild,v 1.1 2014/03/17 10:26:52 pinkbyte Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-
-DOC_CONTENTS="You can define parameters through shell variables OR use config files
-Examples of config files installed in /usr/share/doc/${PF}/examples\n\n
-You have to create ansible hosts file!\n
-More info on http://docs.ansible.com/intro_getting_started.html
-
-Some optional dependencies, you might want to install:
-dev-python/keyczar - needed to support accelerated mode
-dev-python/paramiko - alternative SSH backend"
-
-python_test() {
-	make tests || die "tests failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-	# Hint: do not install example config files into /etc
-	# let this choice to user
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
diff --git a/app-admin/ansible/ansible-1.5.5.ebuild b/app-admin/ansible/ansible-1.5.5.ebuild
index 4d30d2514df3..23ec73bb876b 100644
--- a/app-admin/ansible/ansible-1.5.5.ebuild
+++ b/app-admin/ansible/ansible-1.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/app-admin/ansible/ansible-1.5.5.ebuild,v 1.1 2014/04/29 07:08:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.5.5.ebuild,v 1.2 2014/05/03 21:02:40 pinkbyte Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Radically simple deployment, model-driven configuration management,
 HOMEPAGE="http://ansible.com/"
 SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
diff --git a/app-admin/mate-system-tools/mate-system-tools-1.6.0.ebuild b/app-admin/mate-system-tools/mate-system-tools-1.6.0.ebuild
index dce241b5ae61..1b4e24bc46d0 100644
--- a/app-admin/mate-system-tools/mate-system-tools-1.6.0.ebuild
+++ b/app-admin/mate-system-tools/mate-system-tools-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mate-system-tools/mate-system-tools-1.6.0.ebuild,v 1.1 2014/03/22 19:00:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mate-system-tools/mate-system-tools-1.6.0.ebuild,v 1.2 2014/05/04 14:52:54 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="caja nfs policykit samba"
 
diff --git a/app-admin/webapp-config/webapp-config-1.53.ebuild b/app-admin/webapp-config/webapp-config-1.53.ebuild
index 9f09ac4bfa7f..c5353a77b675 100644
--- a/app-admin/webapp-config/webapp-config-1.53.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.53.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/app-admin/webapp-config/webapp-config-1.53.ebuild,v 1.2 2014/04/06 17:16:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.53.ebuild,v 1.3 2014/05/03 20:57:08 floppym Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 8b5cbeff53bd..4f188fef67ee 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-9999.ebuild,v 1.7 2014/04/06 17:16:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-9999.ebuild,v 1.8 2014/05/03 20:57:08 floppym Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-antivirus/clamav/clamav-0.98.1.ebuild b/app-antivirus/clamav/clamav-0.98.1.ebuild
index bee926462f27..912ef93b576d 100644
--- a/app-antivirus/clamav/clamav-0.98.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.98.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.98.1.ebuild,v 1.3 2014/04/23 10:36:18 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.98.1.ebuild,v 1.4 2014/05/04 08:30:38 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/dpkg/dpkg-1.17.8.ebuild b/app-arch/dpkg/dpkg-1.17.8.ebuild
index 3bdd462864c5..c543e7f1b720 100644
--- a/app-arch/dpkg/dpkg-1.17.8.ebuild
+++ b/app-arch/dpkg/dpkg-1.17.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-arch/dpkg/dpkg-1.17.8.ebuild,v 1.4 2014/04/30 14:21:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.8.ebuild,v 1.5 2014/05/03 14:17:16 maekke Exp $
 
 EAPI=5
 inherit eutils multilib autotools toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 dselect +lzma nls test unicode +update-alternatives +zlib"
 REQUIRED_USE="dselect? ( nls )"
 
diff --git a/app-arch/dpkg/dpkg-1.17.9.ebuild b/app-arch/dpkg/dpkg-1.17.9.ebuild
index 7eaed72e01e3..b2d33f42a913 100644
--- a/app-arch/dpkg/dpkg-1.17.9.ebuild
+++ b/app-arch/dpkg/dpkg-1.17.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-arch/dpkg/dpkg-1.17.9.ebuild,v 1.2 2014/04/30 15:00:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.9.ebuild,v 1.3 2014/05/04 08:20:28 ago Exp $
 
 EAPI=5
 inherit eutils multilib autotools toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 dselect +lzma nls test unicode +update-alternatives +zlib"
 REQUIRED_USE="dselect? ( nls )"
 
diff --git a/app-arch/mate-file-archiver/mate-file-archiver-1.6.1.ebuild b/app-arch/mate-file-archiver/mate-file-archiver-1.6.1.ebuild
index 2f5d4fc4af67..904b3af0baea 100644
--- a/app-arch/mate-file-archiver/mate-file-archiver-1.6.1.ebuild
+++ b/app-arch/mate-file-archiver/mate-file-archiver-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/app-arch/mate-file-archiver/mate-file-archiver-1.6.1.ebuild,v 1.1 2014/03/12 16:32:14 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mate-file-archiver/mate-file-archiver-1.6.1.ebuild,v 1.2 2014/05/04 14:52:59 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="caja"
 
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index c9ebd8661099..acc2a1c996c1 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1 +1,2 @@
 DIST pbzip2-1.1.8.tar.gz 54429 SHA256 d2da7e65d2a2ba5426d6d9bcd15d86cc5f90038efabd5dbc1ef9bded21371f53 SHA512 a3314d1f465e6016bf79ca8bd734fc1485515e9688319ee5a6a837058599546848018f28e2e2cef2afde68ee8f3c26d16e4e6da4c74c75d1cb12068f1d1e1a83 WHIRLPOOL bd24e6102db6425978c5ac8e762b37f4df4bcdcc84f44e06e6b4c652b1f9e3128382af1558a1ebc9f68dba3a89be08d42bf92577eab73b3d748f6ff941b415bf
+DIST pbzip2-1.1.9.tar.gz 47477 SHA256 bd421be03e6e24a24a121ba2355bfd11571356a25ee64fcfa76330750ec5f9c4 SHA512 0c08230858e14d8880cd0ae96f8d9484dbf7e6739c5c3374376ebe25fa331f4b1bc6df0330dd735bef686263d41cc993b032c09da0d7ee1957637b7a61618f21 WHIRLPOOL fdd174690cadcdab07848ba03daeb006306ea5588a1bef6f9d18d6bffe102350621269f256495228a337772101b2157a2d57f46e8d877fe6953f8f1d10b88ce2
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.9-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.9-makefile.patch
new file mode 100644
index 000000000000..39d35a3e0a2b
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.1.9-makefile.patch
@@ -0,0 +1,29 @@
+--- pbzip2-1.1.9/Makefile
++++ pbzip2-1.1.9/Makefile
+@@ -3,7 +3,7 @@
+ 
+ 
+ # Compiler to use
+-CXX = g++
++#CXX = g++
+ 
+ 
+ # Thread-related flags
+@@ -17,7 +17,7 @@
+ 
+ 
+ # Optimization flags
+-CXXFLAGS = -O2
++#CXXFLAGS = -O2
+ 
+ #CXXFLAGS += -g -Wall
+ #CXXFLAGS += -ansi
+@@ -50,7 +50,7 @@
+ 
+ 
+ # Linker flags
+-LDFLAGS =
++#LDFLAGS =
+ 
+ 
+ # External libraries
diff --git a/app-arch/pbzip2/pbzip2-1.1.9.ebuild b/app-arch/pbzip2/pbzip2-1.1.9.ebuild
new file mode 100644
index 000000000000..da0f6e1715e2
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.1.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.9.ebuild,v 1.1 2014/05/03 08:20:16 radhermit Exp $
+
+EAPI=5
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
+HOMEPAGE="http://compression.ca/pbzip2/"
+SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static symlink"
+
+LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	symlink? ( !app-arch/lbzip2[symlink] )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	tc-export CXX
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dobin pbzip2
+	dodoc AUTHORS ChangeLog README
+	doman pbzip2.1
+	dosym pbzip2 /usr/bin/pbunzip2
+
+	if use symlink ; then
+		local s
+		for s in bzip2 bunzip2 bzcat ; do
+			dosym pbzip2 /usr/bin/${s}
+		done
+	fi
+}
diff --git a/app-backup/deja-dup/deja-dup-30.0.ebuild b/app-backup/deja-dup/deja-dup-30.0.ebuild
index 2c59d0d172aa..ffbce4fe38ca 100644
--- a/app-backup/deja-dup/deja-dup-30.0.ebuild
+++ b/app-backup/deja-dup/deja-dup-30.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/app-backup/deja-dup/deja-dup-30.0.ebuild,v 1.1 2014/03/28 14:40:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-30.0.ebuild,v 1.3 2014/05/04 12:09:11 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://launchpad.net/${PN}/30/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus test"
 
 RESTRICT="test"
diff --git a/app-backup/duplicity/duplicity-0.6.23-r1.ebuild b/app-backup/duplicity/duplicity-0.6.23-r1.ebuild
index 3af97c7a758b..d4fe99a61a88 100644
--- a/app-backup/duplicity/duplicity-0.6.23-r1.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.23-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-backup/duplicity/duplicity-0.6.23-r1.ebuild,v 1.1 2014/01/25 18:33:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.23-r1.ebuild,v 1.3 2014/05/04 12:13:09 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="http://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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="s3"
 
 DEPEND="
diff --git a/app-benchmarks/siege/siege-3.0.6.ebuild b/app-benchmarks/siege/siege-3.0.6.ebuild
index 462a44f43c89..4050b1318b62 100644
--- a/app-benchmarks/siege/siege-3.0.6.ebuild
+++ b/app-benchmarks/siege/siege-3.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/app-benchmarks/siege/siege-3.0.6.ebuild,v 1.5 2014/04/13 16:20:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-3.0.6.ebuild,v 1.6 2014/05/04 08:24:17 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
 SRC_URI="http://www.joedog.org/pub/siege/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~mips ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="ssl"
 
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.3.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.3.ebuild
index eeebaa9fbb89..7116b868706a 100644
--- a/app-doc/gnucash-docs/gnucash-docs-2.6.3.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-2.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/app-doc/gnucash-docs/gnucash-docs-2.6.3.ebuild,v 1.1 2014/04/20 11:09:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gnucash-docs/gnucash-docs-2.6.3.ebuild,v 1.3 2014/05/04 12:09:15 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG=no
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="!<=app-office/gnucash-2.2.1"
diff --git a/app-editors/ghex/ghex-3.10.1.ebuild b/app-editors/ghex/ghex-3.10.1.ebuild
index a7856408a0e9..69be2dd258aa 100644
--- a/app-editors/ghex/ghex-3.10.1.ebuild
+++ b/app-editors/ghex/ghex-3.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/app-editors/ghex/ghex-3.10.1.ebuild,v 1.1 2014/04/17 08:25:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-3.10.1.ebuild,v 1.3 2014/05/04 12:09:20 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/mate-text-editor/mate-text-editor-1.6.2.ebuild b/app-editors/mate-text-editor/mate-text-editor-1.6.2.ebuild
index 431a17724011..cbe9efcb9382 100644
--- a/app-editors/mate-text-editor/mate-text-editor-1.6.2.ebuild
+++ b/app-editors/mate-text-editor/mate-text-editor-1.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/app-editors/mate-text-editor/mate-text-editor-1.6.2.ebuild,v 1.1 2014/03/12 17:00:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mate-text-editor/mate-text-editor-1.6.2.ebuild,v 1.2 2014/05/04 14:53:03 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="python spell"
 
diff --git a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
index 47ef1cf29240..1ebe7582ac38 100644
--- a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
+++ b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
@@ -1,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-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild,v 1.2 2014/04/24 09:32:37 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild,v 1.3 2014/05/04 08:32:29 ago Exp $
 
 EAPI=5
 
@@ -13,6 +13,6 @@ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r11.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r11.ebuild
deleted file mode 100644
index 6a2d944455cd..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r11.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r11.ebuild,v 1.1 2014/01/27 13:18:45 ssuominen Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r12.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r12.ebuild
deleted file mode 100644
index 5b233592f55b..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r12.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r12.ebuild,v 1.1 2014/01/30 22:24:42 axs Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r13.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r13.ebuild
deleted file mode 100644
index d58414a4f5b9..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r13.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r13.ebuild,v 1.1 2014/02/06 00:58:07 radhermit Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild
deleted file mode 100644
index 4001b6a906c5..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild,v 1.2 2014/02/08 04:44:06 floppym Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	local x86_libdir=$(get_abi_LIBDIR x86)
-	LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-	echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-	doenvd 99emul-linux-x86-baselibs
-
-	mkdir -p "${ED}${LIBDIR}"
-	mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r15.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r15.ebuild
deleted file mode 100644
index 541e9348057e..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r15.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r15.ebuild,v 1.1 2014/02/09 17:47:41 floppym Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	local x86_libdir=$(get_abi_LIBDIR x86)
-	LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-	echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-	doenvd 99emul-linux-x86-baselibs
-
-	mkdir -p "${ED}${LIBDIR}"
-	mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r16.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r16.ebuild
deleted file mode 100644
index ea435170500b..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r16.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r16.ebuild,v 1.1 2014/02/10 06:58:10 ssuominen Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r17.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r17.ebuild
deleted file mode 100644
index 89a4526af32a..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r17.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r17.ebuild,v 1.1 2014/02/16 01:25:36 alonbl Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r18.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r18.ebuild
deleted file mode 100644
index 25dcef108648..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r18.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r18.ebuild,v 1.1 2014/02/16 05:56:31 tetromino Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r19.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r19.ebuild
deleted file mode 100644
index 9826b0e98025..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r19.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r19.ebuild,v 1.1 2014/02/22 02:50:20 tetromino Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r20.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r20.ebuild
deleted file mode 100644
index c7accf8de29e..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r20.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r20.ebuild,v 1.2 2014/03/01 22:51:19 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r21.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r21.ebuild
deleted file mode 100644
index 88f8dd8f588e..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r21.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/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r21.ebuild,v 1.1 2014/03/04 05:51:01 tetromino Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r22.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r22.ebuild
deleted file mode 100644
index 06a302268635..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r22.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20131008-r22.ebuild,v 1.1 2014/03/27 14:45:24 ssuominen Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild
index 3d57e367fbe7..52a306da48ce 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-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-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild,v 1.3 2014/04/20 12:19:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild,v 1.5 2014/05/04 12:22:23 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -10,7 +10,7 @@ LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
 	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
 	openssl tcp_wrappers_license"
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="abi_x86_32"
 
 SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2"
@@ -71,7 +71,7 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
 		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
 	)
-	>=sys-libs/glibc-2.15" # bug 340613
+	>=sys-libs/glibc-2.16" # bug 340613
 
 PYTHON_UPDATER_IGNORE="1"
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r2.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r2.ebuild
deleted file mode 100644
index f49af4177e06..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r2.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/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r2.ebuild,v 1.2 2014/04/20 12:19:03 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	!abi_x86_32? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-	rm -rf "${ED}"/usr/include # needed for openssl tbz2
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r3.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r3.ebuild
index 3745b342e080..6b2ffe2afc2e 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r3.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-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-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r3.ebuild,v 1.1 2014/05/02 16:15:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r3.ebuild,v 1.2 2014/05/03 13:04:10 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -77,7 +77,7 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
 		>=virtual/acl-0-r2[abi_x86_32(-)]
 	)
-	>=sys-libs/glibc-2.15" # bug 340613
+	>=sys-libs/glibc-2.16" # bug 340613
 
 PYTHON_UPDATER_IGNORE="1"
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild
deleted file mode 100644
index 3b2a082f7755..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-20140406.ebuild,v 1.2 2014/04/20 12:19:03 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	!abi_x86_32? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r12 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r12
deleted file mode 100644
index f7fe0dc9b747..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r12
+++ /dev/null
@@ -1,248 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libturbojpeg.so.0*
-usr/lib32/libjpeg.so.8.0.2
-usr/lib32/libjpeg.so.8
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r13 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r13
deleted file mode 100644
index 1755f7704e94..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r13
+++ /dev/null
@@ -1,251 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libturbojpeg.so.0*
-usr/lib32/libjpeg.so.8.0.2
-usr/lib32/libjpeg.so.8
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r14 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r14
deleted file mode 100644
index 695c46a185fc..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r14
+++ /dev/null
@@ -1,248 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r15 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r15
deleted file mode 100644
index beb8458c1a98..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r15
+++ /dev/null
@@ -1,252 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r16 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r16
deleted file mode 100644
index beb8458c1a98..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r16
+++ /dev/null
@@ -1,252 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r17 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r17
deleted file mode 100644
index 1d6c167f3611..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r17
+++ /dev/null
@@ -1,260 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libtasn1.so
-usr/lib32/libtasn1.so.3
-usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r18 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r18
deleted file mode 100644
index e9ce337fcfd7..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r18
+++ /dev/null
@@ -1,264 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-usr/lib32/libtasn1.so.3
-usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r19 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r19
deleted file mode 100644
index 0bcebd586321..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r19
+++ /dev/null
@@ -1,265 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r20 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r20
deleted file mode 100644
index 703070a779c6..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r20
+++ /dev/null
@@ -1,271 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r21 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r21
deleted file mode 100644
index d7e94087f97c..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r21
+++ /dev/null
@@ -1,279 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r22 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r22
deleted file mode 100644
index 7f6a74cb703e..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r22
+++ /dev/null
@@ -1,280 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.7
-usr/lib32/libz.so
-usr/lib32/pkgconfig/zlib.pc
-usr/lib32/libminizip.so
-usr/lib32/libminizip.so.1
-usr/lib32/libminizip.so.1.0.0
-usr/lib32/pkgconfig/minizip.pc
-lib32/libbz2.so.1
-lib32/libbz2.so.1.0
-lib32/libbz2.so.1.0.6
-usr/lib32/libbz2.so
-usr/lib32/libpng.so
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.11/include/ffi.h
-usr/lib32/libffi-3.0.11/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.0
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/llvm/BugpointPasses.so
-usr/lib32/llvm/LLVMHello.so
-usr/lib32/llvm/libLLVM-3.1.so
-usr/lib32/llvm/libLTO.so
-usr/lib32/llvm/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.0.1
-usr/lib32/pkgconfig/libraw1394.pc
-usr/lib32/libavc1394.so
-usr/lib32/libavc1394.so.0
-usr/lib32/libavc1394.so.0.3.0
-usr/lib32/pkgconfig/libavc1394.pc
-usr/lib32/librom1394.so
-usr/lib32/librom1394.so.0
-usr/lib32/librom1394.so.0.3.0
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so*
diff --git a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20140406.ebuild b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20140406.ebuild
index 4afbf456e968..65c715b1c4d3 100644
--- a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20140406.ebuild
@@ -1,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/emul-linux-x86-compat/emul-linux-x86-compat-20140406.ebuild,v 1.1 2014/04/06 09:03:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20140406.ebuild,v 1.2 2014/05/04 12:22:28 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86 eutils multilib
@@ -9,7 +9,7 @@ DESCRIPTION="32 bit lib-compat, and also libgcc_s and libstdc++ from gcc 3.3 and
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="multilib"
 
 DEPEND=""
diff --git a/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140406.ebuild b/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140406.ebuild
index 153a39da8255..542f51aecb06 100644
--- a/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140406.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-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140406.ebuild,v 1.1 2014/04/06 09:04:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140406.ebuild,v 1.2 2014/05/04 12:22:33 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="Boost-1.0 LGPL-2.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140406.ebuild b/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140406.ebuild
index 08476f890f5d..cb83f9400e32 100644
--- a/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140406.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-emulation/emul-linux-x86-db/emul-linux-x86-db-20140406.ebuild,v 1.1 2014/04/06 09:05:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140406.ebuild,v 1.2 2014/05/04 12:22:38 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140406.ebuild b/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140406.ebuild
index 7df34b6bcd43..422d69b1f09f 100644
--- a/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140406.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-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140406.ebuild,v 1.1 2014/04/06 09:06:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140406.ebuild,v 1.2 2014/05/04 12:22:43 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="GPL-2 LGPL-2 LGPL-2.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild
index 93fda87bd00a..9e343e8b6977 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.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-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild,v 1.2 2014/04/18 21:41:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild,v 1.3 2014/05/04 12:22:48 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="abi_x86_32"
 
 DEPEND=""
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20140406.ebuild b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20140406.ebuild
index 3fa41fb9a7f7..1f374d85b6ea 100644
--- a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20140406.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-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20140406.ebuild,v 1.1 2014/04/06 09:07:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20140406.ebuild,v 1.2 2014/05/04 12:22:53 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="LGPL-2 LGPL-2.1 GPL-2"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
diff --git a/app-emulation/emul-linux-x86-jna/emul-linux-x86-jna-20140406.ebuild b/app-emulation/emul-linux-x86-jna/emul-linux-x86-jna-20140406.ebuild
index bad0534793cc..a76309902df3 100644
--- a/app-emulation/emul-linux-x86-jna/emul-linux-x86-jna-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-jna/emul-linux-x86-jna-20140406.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-emulation/emul-linux-x86-jna/emul-linux-x86-jna-20140406.ebuild,v 1.1 2014/04/06 09:08:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-jna/emul-linux-x86-jna-20140406.ebuild,v 1.2 2014/05/04 12:22:58 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="LGPL-2.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild
index 19eba87f5b22..1ef423add9e4 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.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-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild,v 1.2 2014/04/28 20:39:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild,v 1.3 2014/05/04 12:23:03 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="abi_x86_32"
 
 DEPEND=""
diff --git a/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20140406.ebuild b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20140406.ebuild
index 244076030a24..b90e389bb996 100644
--- a/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20140406.ebuild
@@ -1,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/emul-linux-x86-motif/emul-linux-x86-motif-20140406.ebuild,v 1.1 2014/04/06 09:09:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20140406.ebuild,v 1.2 2014/05/04 12:23:08 pacho Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit emul-linux-x86
 
 SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
 LICENSE="!abi_x86_32? ( LGPL-2+ MIT MOTIF ) abi_x86_32? ( metapackage )"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="abi_x86_32"
 
 RDEPEND="!<app-emulation/emul-linux-x86-xlibs-20110129
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140406.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140406.ebuild
index 2a3a1768ab40..eec7a51c7ce7 100644
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140406.ebuild
@@ -1,13 +1,13 @@
 # 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-opengl/emul-linux-x86-opengl-20140406.ebuild,v 1.1 2014/04/06 09:10:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140406.ebuild,v 1.2 2014/05/04 12:23:13 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
 LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )"
-KEYWORDS="-* ~amd64 ~amd64-linux"
+KEYWORDS="-* amd64 ~amd64-linux"
 IUSE="abi_x86_32"
 
 DEPEND="app-admin/eselect-opengl
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140406.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140406.ebuild
index 1c0b2c955da0..d07e7143f7ff 100644
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140406.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-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140406.ebuild,v 1.1 2014/04/06 09:11:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140406.ebuild,v 1.2 2014/05/04 12:23:18 pacho Exp $
 
 EAPI=5
 inherit eutils emul-linux-x86
 
 LICENSE="LGPL-2.1 GPL-3"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 IUSE="gtkstyle"
 
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406-r2.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406-r2.ebuild
new file mode 100644
index 000000000000..e76dad75cce4
--- /dev/null
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406-r2.ebuild
@@ -0,0 +1,36 @@
+# 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-sdl/emul-linux-x86-sdl-20140406-r2.ebuild,v 1.1 2014/05/03 10:49:38 mgorny Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="LGPL-2 LGPL-2.1 ZLIB"
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
+	~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-soundlibs-${PV}
+	~app-emulation/emul-linux-x86-medialibs-${PV}
+	abi_x86_32? (
+		>=media-libs/openal-1.15.1-r1[abi_x86_32(-)]
+		>=media-libs/freealut-1.1.0-r3[abi_x86_32(-)]
+		>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+		>=media-libs/sdl-gfx-2.0.24-r1[abi_x86_32(-)]
+		>=media-libs/sdl-image-1.2.12-r1[abi_x86_32(-)]
+		>=media-libs/sdl-mixer-1.2.12-r4[abi_x86_32(-)]
+		>=media-libs/sdl-net-1.2.8-r1[abi_x86_32(-)]
+		>=media-libs/sdl-sound-1.0.3-r1[abi_x86_32(-)]
+		>=media-libs/sdl-ttf-2.0.11-r1[abi_x86_32(-)]
+		>=media-libs/smpeg-0.4.4-r10[abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	use abi_x86_32 || emul-linux-x86_src_prepare
+}
+
+src_install() {
+	use abi_x86_32 || emul-linux-x86_src_install
+}
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406.ebuild
index 6b537e39a832..fc2cc7452d26 100644
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406.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-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406.ebuild,v 1.1 2014/04/06 09:12:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406.ebuild,v 1.2 2014/05/04 12:23:23 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="LGPL-2 LGPL-2.1 ZLIB"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="abi_x86_32"
 
 DEPEND=""
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild
index 51e08d636c21..693026fa25b1 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.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-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild,v 1.2 2014/04/12 08:38:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild,v 1.3 2014/05/04 12:23:28 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="abi_x86_32 alsa +pulseaudio"
 
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild
index 026385d65f57..f362bc0c2a93 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild
@@ -1,13 +1,13 @@
 # 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-xlibs/emul-linux-x86-xlibs-20140406.ebuild,v 1.1 2014/04/06 09:14:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild,v 1.2 2014/05/04 12:23:33 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
 LICENSE="!abi_x86_32? ( FTL GPL-2 MIT ) abi_x86_32? ( metapackage )"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="abi_x86_32 opengl"
 
 DEPEND=""
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 7c00d67ffb73..92e9eb4ae9df 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -2,3 +2,4 @@ DIST lxc-0.8.0-backports-1.tar.xz 2424 SHA256 5b68b96b9fbc2d0f5b2ad2e7fb996a3d83
 DIST lxc-0.8.0-rc2-backports-2.tar.xz 4616 SHA256 c371817b5be47ed70dea410a32dc434a060073992d5299d2c88853de79aa2111 SHA512 ca646ae325a4cf94632c443397834a8a7dc004874b528d2d685b698b3eda1e72e09ecfd68899b9c0cd17d5d7bf1a62230dd6d17d26f73d2d4ecbf1932c31b996 WHIRLPOOL 76deca3e2b7fe306c0e2f538759fb33656f08c52d1b59570edc6f3d2444d387a0f7944f759baf41402e747eb055ab403a82a40b95ba0c7d42d0644a5f990e851
 DIST lxc-0.8.0-rc2.tar.gz 302999 SHA256 1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef SHA512 e6608f980489f67d412c9a50f8c3f65c1afbba520dfdfe2b695c597c2706544291f31c8cfca2d86cfbab09029f8a5706fae5ab72f1c45dccca5f7e2ae8851181 WHIRLPOOL b41fe7e14315b9e6702070535edfee68379c01fba23d143c5f11afa20f6d392c8bc32953da46ec3f74d7a2affe9f828d918f23a8a16c430e3b8ffcc9b2c10057
 DIST lxc-0.8.0.tar.gz 309973 SHA256 eac833730b94e423d4bef6834bc4a716437d2abd6ab8b24334c506aaaa08692c SHA512 47333e2010d0f4488b8876ba933f2d26304874bec0371a7ab3b6e5bd1a50a7d2312ff8507e273f1ee2341a7f2e3b79cd71e5e19ac31006a4e429ee96b01733f6 WHIRLPOOL 693b7d354dec7c6102d5ce3a42a9b618e213fd9ee8c592068ebadb7f25094606abce6c3da77b483fab0938410215010f71d487f336856c87327d6a98f20b65dd
+DIST lxc-1.0.3.tar.gz 538073 SHA256 9fc4ac60a842058e4ad0fe6a281dc0079ee9830afa1852a10fa044219f2c6412 SHA512 95d7080cdb34776b601959bbc95572b1d6defeaec6820a38d9b09eb05bb43eaa4a2c4d9fae26f4d1a7ee13ad6cd104c36dd5cbe6ee5e44f274135e42370cc983 WHIRLPOOL 99324332f6d1f50dc3c0c9e54a565295b2186183f9e198418a8a891b799befebabf42784eab02988643ee0c1c77389dc0ce9ae28a5da4df42f9eb2749e0b0da4
diff --git a/app-emulation/lxc/lxc-1.0.3.ebuild b/app-emulation/lxc/lxc-1.0.3.ebuild
new file mode 100644
index 000000000000..ab1e9034e24c
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.0.3.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.0.3.ebuild,v 1.1 2014/05/03 18:43:36 hwoarang Exp $
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+
+inherit autotools distutils-r1 eutils linux-info versionator flag-o-matic systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="http://lxc.sourceforge.net/"
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="doc examples lua python seccomp"
+
+RDEPEND="net-libs/gnutls
+	sys-libs/libcap
+	lua? ( >=dev-lang/lua-5.1 )
+	python? ( ${PYTHON_DEPS} )
+	seccomp? ( sys-libs/libseccomp )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )
+	>=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+	sys-apps/util-linux
+	app-misc/pax-utils
+	virtual/awk"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~RESOURCE_COUNTERS
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~DEVPTS_MULTIPLE_INSTANCES
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP
+
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:	needed for pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:	needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:	needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:	needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:	needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:	needed for internal (inter-container) networking"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:	needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:	as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT=":CONFIG_GRKERNSEC_CHROOT_MOUNT	some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE=":CONFIG_GRKERNSEC_CHROOT_DOUBLE	some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT=":CONFIG_GRKERNSEC_CHROOT_PIVOT	some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD=":CONFIG_GRKERNSEC_CHROOT_CHMOD	some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS	some GRSEC features make LXC unusable see postinst notes"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS TODO README doc/FAQ.txt)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	if [[ -n ${BACKPORTS} ]]; then
+		epatch "${WORKDIR}"/patches/*
+	fi
+
+	if use python; then
+		python_setup
+		# We will handle python on our own
+		echo > "${S}/src/python-${PN}/Makefile.am";
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--localstatedir=/var \
+		--bindir=/usr/sbin \
+		--docdir=/usr/share/doc/${PF} \
+		--with-config-path=/etc/lxc	\
+		--with-rootfs-path=/usr/lib/lxc/rootfs \
+		$(use_enable doc) \
+		--disable-apparmor \
+		$(use_enable examples) \
+		$(use_enable lua) \
+		$(use_enable python)
+}
+
+python_compile() {
+	distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${S}/src/python-${PN}" > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use python; then
+		pushd "${S}/src/python-lxc" > /dev/null
+		# Unset DOCS. This has been handled by the default target
+		unset DOCS
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	keepdir /etc/lxc /usr/lib/lxc/rootfs /var/log/lxc
+
+	find "${D}" -name '*.la' -delete
+
+	# Gentoo-specific additions!
+	newinitd "${FILESDIR}/${PN}.initd.2" ${PN}
+
+	# lxc-devsetup script
+	exeinto /usr/libexec/${PN}
+	doexe config/init/systemd/${PN}-devsetup
+	# Use that script with the systemd service (Similar to upstream
+	# Makefile.am
+	cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service
+	sed -i \
+		"/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
+		${PN}_at.service \
+		|| die "Failed to add ${PN}-devsetup to the systemd service file"
+	systemd_newunit ${PN}_at.service "lxc@.service"
+}
+
+pkg_postinst() {
+	elog "There is an init script provided with the package now; no documentation"
+	elog "is currently available though, so please check out /etc/init.d/lxc ."
+	elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
+	elog "to start the container defined into /etc/lxc/configname.conf ."
+	elog "For further information about LXC development see"
+	elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
+	elog ""
+	ewarn "With version 0.7.4, the mountpoint syntax came back to the one used by 0.7.2"
+	ewarn "and previous versions. This means you'll have to use syntax like the following"
+	ewarn ""
+	ewarn "    lxc.rootfs = /container"
+	ewarn "    lxc.mount.entry = /usr/portage /container/usr/portage none bind 0 0"
+	ewarn ""
+	ewarn "To use the Fedora, Debian and (various) Ubuntu auto-configuration scripts, you"
+	ewarn "will need sys-apps/yum or dev-util/debootstrap."
+	ewarn ""
+	ewarn "Some GrSecurity settings in relation to chroot security will cause LXC not to"
+	ewarn "work, while others will actually make it much more secure. Please refer to"
+	ewarn "Diego Elio Pettenò's weblog at http://blog.flameeyes.eu/tag/lxc for further"
+	ewarn "details."
+}
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index 138cece73f9a..cc2018606483 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -9,6 +9,7 @@
     <email>dev-zero@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="seccomp">Use seccomp syscall filters using <pkg>sys-libs/libseccomp</pkg></flag>
     <flag name="vanilla">
       Avoid adding Gentoo Linux-specific modifications, which include
       the custom init script. This is present as a flag to avoid
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index bbc2bdd82f3e..1bc7c97bb4ae 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -46,6 +46,7 @@ DIST wine-1.7.14.tar.bz2 21444526 SHA256 2df1937e28936ba33e70a42fddcee01097ca0fb
 DIST wine-1.7.15.tar.bz2 21463370 SHA256 519137adc562d32035fcf7b110d6e65fdd7721af0b176567a2187397c63f1380 SHA512 7ac95fa4c873570ff04c2ab4adca40d3898cb0f0d5bea081208bb8d16787470f75a9f6f20a1f7123eebbf2acd977391ae35b107c59e25fa48ef3b0bcdcb559b6 WHIRLPOOL d114d2022e91c663e33181213260eecf63d10d515167c27e4fca75bd47f3036a02943c5d5f5ee103202732b9b7c2ae2964724bd88892aeec2c15e634132f5aef
 DIST wine-1.7.16.tar.bz2 21478085 SHA256 071ed89d9c76219aa73df6472b99f9f0b35e4977235e2b8e388c11416a2d1c6a SHA512 7baa99280f78eb8881dba470c3a17ab093f9cfb0950eb4dea1a89849ee0794ddda373049fda2fde5551963b231e4548345892e759cf4690ab047c49147fa504e WHIRLPOOL b6ef7a096837d406b0f9a67f6719dae85c12e2f0d00dc9fdcefacd9db5485fccacdfa788e68abf0a279c20daee246ab7d25aeb14f1e96c5bb3187f38550157c1
 DIST wine-1.7.17.tar.bz2 21531865 SHA256 bb6fbd7fd70f9aafba557995d9ce537ded56e750e0a89a062e3318d584a8abef SHA512 32ff77d201200cb8a159395fe5d410b118bf4db16a89a9708128dbb7c25e45457c80d76e2821edf06db99525e5a93b6b1a7ee7166d7972f7ceb7fc47aaf8784b WHIRLPOOL 55f6fe3fced59c6344b2656a22eeba478be4a138ec26c28306316cb0dfdaed0c41f71584dbda683070a1a03a45a010fdd2989a8cb95a81294fa2d8b13c55cbaf
+DIST wine-1.7.18.tar.bz2 21595718 SHA256 dab6d12e620e2097a6838a3f6928f3b2ca3aab0b70521b53107ee1998303d378 SHA512 059f60318508f158cceef029c111c2b11bdf334def95aa96361163358ad7632f87fe0d1d9a05060a5b76ddcb367d8490fd31a1b512ecf7cd01f7be82a8ff8677 WHIRLPOOL 8b2dfdb85a7271a447fc827f4afb697bebc3fa3f52463b0debb1631e3c156fe46b00839d94b7e27be1407009608f54f07acb211c68fb6448f7ad30ccbdacf55d
 DIST wine-1.7.3.tar.bz2 21489049 SHA256 c66c93c2ffec8d1d9922fbaa226b169d62deb77fcbfd0fbd7379b77dbd97d47f SHA512 41109866b259a5f939c9ca4c26ed0a5ca74fa9cafa2f348b83510dd386459c87ac044a6f954f2f83ce00961d866a6e636ed96aa9e94584b7a79486d434b406cc WHIRLPOOL 90e6aed8930e3496701292415ce87f29a87870a1d00ad26d4f3c4adf33cd296093d0ef3d363bf5cead1ebd5ab4e86907ccb015c10d85f6f90d5f48cd81681b0f
 DIST wine-1.7.4.tar.bz2 21500746 SHA256 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969 SHA512 4267eb43311fe53537a1864a70e88e4bf444b8979dc858725a1170ed06af4e727604a22bafb3deb448eeb62c170ce67ce8eb8082bce040f5488b1a4c4bc6bb95 WHIRLPOOL 7bb14e0dfd4f9a7411e1d5484dba62f8584a0e03997cc3c6192893dccbc7de316eb79a1e5b0ccf96d20e74cf512ebc79e760076ff4882625bc81b410ad8be0bf
 DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
diff --git a/app-emulation/wine/wine-1.7.18.ebuild b/app-emulation/wine/wine-1.7.18.ebuild
new file mode 100644
index 000000000000..db4b8d54d720
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.18.ebuild
@@ -0,0 +1,445 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.1 2014/05/04 01:23:57 tetromino Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.24"
+MV="4.5.2"
+PULSE_PATCHES="winepulse-patches-1.7.12"
+WINE_GENTOO="wine-gentoo-2013.06.24"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+NATIVE_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0  )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	udisks? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
+	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups:= )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:0= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:2= )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	netapi? ( net-fs/samba[netapi(+)] )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC:= )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-sound/pulseaudio )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( net-libs/gnutls:= )
+	png? ( media-libs/libpng:0= )
+	v4l? ( media-libs/libv4l )
+	xcomposite? ( x11-libs/libXcomposite )"
+
+COMMON_DEPEND="
+	!amd64? ( ${NATIVE_DEPEND} )
+	amd64? (
+		abi_x86_64? ( ${NATIVE_DEPEND} )
+		abi_x86_32? (
+			truetype? ( || (
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
+				>=media-libs/freetype-2.0.0[abi_x86_32]
+			) )
+			ncurses? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-libs/ncurses[abi_x86_32]
+			) )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				sys-apps/dbus[abi_x86_32]
+			) )
+			fontconfig? ( || (
+				app-emulation/emul-linux-x86-xlibs[development]
+				media-libs/fontconfig[abi_x86_32]
+			) )
+			gphoto2? (
+				app-emulation/emul-linux-x86-medialibs[development]
+			)
+			openal? ( || (
+				app-emulation/emul-linux-x86-sdl[development]
+				media-libs/openal[abi_x86_32]
+			) )
+			gstreamer? (
+				app-emulation/emul-linux-x86-gstplugins
+				app-emulation/emul-linux-x86-medialibs[development]
+			)
+			X? ( || (
+				app-emulation/emul-linux-x86-xlibs[development]
+				(
+					x11-libs/libXcursor[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+					x11-libs/libXrandr[abi_x86_32]
+					x11-libs/libXi[abi_x86_32]
+					x11-libs/libXxf86vm[abi_x86_32]
+				)
+			) )
+			xinerama? ( || (
+				app-emulation/emul-linux-x86-xlibs[development]
+				x11-libs/libXinerama[abi_x86_32]
+			) )
+			alsa? ( || (
+				app-emulation/emul-linux-x86-soundlibs[alsa,development]
+				media-libs/alsa-lib[abi_x86_32]
+			) )
+			cups? ( app-emulation/emul-linux-x86-baselibs )
+			opencl? ( virtual/opencl[abi_x86_32] )
+			opengl? ( || (
+				app-emulation/emul-linux-x86-opengl[development]
+				(
+					virtual/glu[abi_x86_32]
+					virtual/opengl[abi_x86_32]
+				)
+			) )
+			gsm? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				media-sound/gsm[abi_x86_32]
+			) )
+			jpeg? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				virtual/jpeg:0[abi_x86_32]
+			) )
+			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
+			lcms? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				media-libs/lcms:2[abi_x86_32]
+			) )
+			mp3? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/mpg123-1.5.0[abi_x86_32]
+			) )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-devel/gettext[abi_x86_32]
+			) )
+			odbc? ( app-emulation/emul-linux-x86-db[development] )
+			osmesa? ( || (
+				>=app-emulation/emul-linux-x86-opengl-20121028[development]
+				media-libs/mesa[osmesa,abi_x86_32]
+			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				(
+					dev-libs/libxml2[abi_x86_32]
+					dev-libs/libxslt[abi_x86_32]
+				)
+			) )
+			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
+			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
+			png? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				media-libs/libpng:0[abi_x86_32]
+			) )
+			v4l? ( || (
+				app-emulation/emul-linux-x86-medialibs[development]
+				media-libs/libv4l[abi_x86_32]
+			) )
+			xcomposite? ( || (
+				app-emulation/emul-linux-x86-xlibs[development]
+				x11-libs/libXcomposite[abi_x86_32]
+			) )
+		)
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+
+	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
+	unpack "${WINE_GENTOO}.tar.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	use pulseaudio && PATCHES+=(
+		"../${PULSE_PATCHES}"/*.patch #421365
+	)
+
+	autotools-utils_src_prepare
+
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+do_configure() {
+	local myeconfargs=( "${myeconfargs[@]}" )
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myeconfargs+=( --enable-win64 )
+		else
+			use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
+			# We currently don't have 32-bit libnetapi on amd64; #494394
+			myeconfargs+=(
+				--without-netapi
+				--disable-win64
+			)
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	local myeconfargs=( # common
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with png)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use pulseaudio && myeconfargs+=( --with-pulse )
+
+	if use amd64 && use abi_x86_32; then
+		# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+		# set AR and RANLIB to make QA scripts happy; #483342
+		tc-export PKG_CONFIG AR RANLIB
+	fi
+
+	multilib_parallel_foreach_abi do_configure
+}
+
+src_compile() {
+	autotools-multilib_src_compile depend
+	autotools-multilib_src_compile all
+}
+
+src_test() {
+	if [[ $(id -u) == 0 ]]; then
+		ewarn "Skipping tests since they cannot be run under the root user."
+		ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+		return
+	fi
+
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	multilib_toolchain_setup x86
+	local BUILD_DIR="${S}-${ABI}"
+	cd "${BUILD_DIR}" || die
+	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
+}
+
+src_install() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+	autotools-multilib_src_install
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 94add3de99a4..99a2797dd19b 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -3,3 +3,4 @@ DIST byobu_5.74.orig.tar.gz 645626 SHA256 7df6c1cbf6645cf929ca046628c6b9a92a9744
 DIST byobu_5.76.orig.tar.gz 646473 SHA256 cd1b64e2f93b2ef513ece9853b225a7d7764c1b708c423acddfc2763929fa3ac SHA512 31ac686fae2ac9c8570466a639427a9d4b1092ebc89950b551172c79acdd74530a21d2902d927e33cedcf0d399057c51154f66cf1c9c4ba7ddee6ae0edeb9a12 WHIRLPOOL a79c940a3a5e15e881350b0f89d102f470bdc56baaecf14ac9b21d61e0f90f6dbb527387eaed250196977c70ee197d06e5e8e60c0b766822e458e77836228fd1
 DIST byobu_5.77.orig.tar.gz 649172 SHA256 94247a87f93a45b15aeff83f8e4cc3082d78e7313ceebd9d50855f91858ac064 SHA512 dd1093f78b59999f137dca9a45904fb324d8bc2880e678f084481834d9444e09c553ed71ee57a58e664e6bf36ebdabb3ccfcb9d99fe0d330e02c100cafe8d252 WHIRLPOOL e1fc2dd01591e59f19a27d78c920ba7e0f59e8ad5fce0300b1dbb3b779c2805b40c5657cf3601ab833148d00441d9add5438820dcedc58ad78b91f7dc141f4cf
 DIST byobu_5.78.orig.tar.gz 649257 SHA256 fe18120c342fbcb6510f610cb51bcbb31fb2a84688bda2671c6bb4ff27ac370c SHA512 34fef79e0d36990f3d0a5bd9d874c914e9f3997b7c4b86f1764a7e0dc8ce038ad5e650ea2d9cd5557aae9105680f281ef4e45744085c01784e464a7a399f710c WHIRLPOOL fb8352cf911d376b4261819e7e15aa3f23bed2d591831b71a40917a32edc49e05d6b231183289a6d2e54a5a8839726cae0235eb7d4e5bfc3210556e4bee91d52
+DIST byobu_5.80.orig.tar.gz 650085 SHA256 65c452fa3dd6ebc17ff15564e67dc1088c7462c62cc4465b5ca935471b249beb SHA512 b012f94aec19ec8371866d5b8e9591389780e00e281cc838726f7090055f7c7fcdfc66f1bb46e529cd8eb19ba8e49488a52b99fa0498099cf3eedd043868d0c2 WHIRLPOOL 006e8809d36a72e4902f489d83e060eca6df83414210a280c3987d2a1ed35792bcb03ae7f7bdc0825ecc9417013b6a4bcea2daa23945d3ddf00d117d10c5a88b
diff --git a/app-misc/byobu/byobu-5.80.ebuild b/app-misc/byobu/byobu-5.80.ebuild
new file mode 100644
index 000000000000..5031458bf1f8
--- /dev/null
+++ b/app-misc/byobu/byobu-5.80.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.80.ebuild,v 1.1 2014/05/03 07:09:05 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-office/dia/dia-0.97.3_pre20140417.ebuild b/app-office/dia/dia-0.97.3_pre20140417.ebuild
index cf11a93f8b08..821326886740 100644
--- a/app-office/dia/dia-0.97.3_pre20140417.ebuild
+++ b/app-office/dia/dia-0.97.3_pre20140417.ebuild
@@ -1,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/dia/dia-0.97.3_pre20140417.ebuild,v 1.2 2014/05/02 13:03:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild,v 1.4 2014/05/04 12:09:27 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG=yes
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-0.97.2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 # the doc USE flag doesn't seem to do anything without docbook2html
 IUSE="cairo doc python"
 
diff --git a/app-office/gnucash/gnucash-2.6.3.ebuild b/app-office/gnucash/gnucash-2.6.3.ebuild
index 7ee15af962f1..5a3785e200b3 100644
--- a/app-office/gnucash/gnucash-2.6.3.ebuild
+++ b/app-office/gnucash/gnucash-2.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/app-office/gnucash/gnucash-2.6.3.ebuild,v 1.1 2014/04/20 11:15:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.6.3.ebuild,v 1.3 2014/05/04 12:09:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
diff --git a/app-office/gnumeric/gnumeric-1.12.14.ebuild b/app-office/gnumeric/gnumeric-1.12.14.ebuild
index 339295a86907..8393fb89408b 100644
--- a/app-office/gnumeric/gnumeric-1.12.14.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.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-office/gnumeric/gnumeric-1.12.14.ebuild,v 1.2 2014/04/26 08:16:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.14.ebuild,v 1.4 2014/05/04 12:09:42 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/grisbi/grisbi-1.0.0.ebuild b/app-office/grisbi/grisbi-1.0.0.ebuild
index fffc79db5b34..5bcf019cb82d 100644
--- a/app-office/grisbi/grisbi-1.0.0.ebuild
+++ b/app-office/grisbi/grisbi-1.0.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/app-office/grisbi/grisbi-1.0.0.ebuild,v 1.2 2014/03/26 21:30:37 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-1.0.0.ebuild,v 1.4 2014/05/04 12:09:47 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ IUSE="nls ofx ssl"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="dev-libs/libxml2
 	>=dev-libs/glib-2.18.0:2
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
index 68005c8e580c..0549788332e2 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild,v 1.14 2014/03/21 11:21:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild,v 1.15 2014/05/03 20:58:27 floppym Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
 PYTHON_REQ_USE="xml"
 
diff --git a/app-portage/layman/layman-2.0.0-r3.ebuild b/app-portage/layman/layman-2.0.0-r3.ebuild
index 3688de422bf9..108e5011da31 100644
--- a/app-portage/layman/layman-2.0.0-r3.ebuild
+++ b/app-portage/layman/layman-2.0.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-portage/layman/layman-2.0.0-r3.ebuild,v 1.5 2014/04/29 20:37:56 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0-r3.ebuild,v 1.6 2014/05/03 14:12:09 maekke Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs +git mercurial subversion test"
 
 DEPEND="test? ( dev-vcs/subversion )"
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
index d6eef5031dcc..2ce9e1f75e29 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.0.1.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/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild,v 1.13 2013/10/17 07:13:37 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild,v 1.14 2014/05/03 20:59:25 floppym Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index a99cba81cddf..486dd13fda92 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.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/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.6 2014/03/02 08:35:11 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.7 2014/05/03 20:59:25 floppym Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-2 prefix
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 7723d6ece859..39d5b62da00a 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,4 +2,4 @@ DIST calibre-1.2.0.tar.xz 29652528 SHA256 d27fdbe981620aa63f5c70909c63a3a7b747ce
 DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
 DIST calibre-1.25.0.tar.xz 32683456 SHA256 cd95f64b721c6e7d0f392a7fce2c177bc8e1dec6a367891b3582e0b74b0e42f8 SHA512 fde5abbff3c4785160aa6286a8a50ae80ebf97a262b6902d6158648ba08c6d030e6031ced168131891d4cc7c291c74b6c3c7ce72be23c62c2dd783f47f0473b4 WHIRLPOOL f3cd373e8dbdfaff2d9e00cb7449916b0c6d2ae4530466ce1e98c8e5cb91e667db2a19952a11d5d35c044d6eb6804fc583d584753bec708560544e75c299aaf0
 DIST calibre-1.29.0.tar.xz 33022868 SHA256 b9cc2081528b72d7082e15efbc75b4edccf3e504d30697886bf23da4fa834faa SHA512 17a1e83c610122ef1bd0e4e0162bd907eec17fe7b012fb5476d3eb3d7e65df6d7b3e609d4b32cd6489fcddbfc55ac521b0e5f88d7cc2b2ccbf5f566e53c2f126 WHIRLPOOL e4501c9ed09b27853158c7485304c30be3cf4e1223ed5950d6d2ad1fb193941ea9a4ba4e1c7b37efe8252439993d51d15efaeadb190e5a3f25fe36455ff7a33b
-DIST calibre-1.34.0.tar.xz 33948776 SHA256 c1dcde1da1dd0e3117f4ee44f15d2d59de7d96c595da2a028742692bd59a37e6 SHA512 2f205786d1b06da40d45ba297c26b96dc2db32dab421a957e14e68b597e07d80b30d5c33d19688a81e4b0bbe8c47d912052ab83ce3c19c82358557e303e1a23b WHIRLPOOL 9136d1a1969daddf4fa8ab1683e11f77655c347f8ed14d7c48757e9d0890f7650aef188a9d8671c49fef0cbb5e46980ffed060d5dd58b2fc5b13e53aa760426f
+DIST calibre-1.35.0.tar.xz 34006392 SHA256 710941d2001a67959d9ccc11f8b89368e5d79cf96dbaa6e73efc92965cb8fd5f SHA512 d2946b7ecb6693c299067b5e870f5b2371a9fa3229ed15b2b34b2d1d641548486eb900235c2bc741ebd20a9ee237dcf644e662a125f085c1c04ab89c5fca1899 WHIRLPOOL 177135970f95016f8aea75b9146762874510618816118bea9edf13dbb8356a41a331e2828246e6fc5dc396ead7e610388ecdb9d76a479148d9d1b5c4e445b509
diff --git a/app-text/calibre/calibre-1.34.ebuild b/app-text/calibre/calibre-1.35.ebuild
similarity index 82%
rename from app-text/calibre/calibre-1.34.ebuild
rename to app-text/calibre/calibre-1.35.ebuild
index 9836098a7ab5..7f8f8124a8ea 100644
--- a/app-text/calibre/calibre-1.34.ebuild
+++ b/app-text/calibre/calibre-1.35.ebuild
@@ -1,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/calibre/calibre-1.34.ebuild,v 1.2 2014/05/01 16:14:31 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.35.ebuild,v 1.1 2014/05/03 19:42:58 axs Exp $
 
 EAPI=5
 
@@ -42,18 +42,18 @@ COMMON_DEPEND="
 	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
 	>=dev-libs/chmlib-0.40:=
 	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17
-	>=dev-python/beautifulsoup-3.0.5:python-2
-	dev-python/netifaces
-	dev-python/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssselect-0.7.1
-	>=dev-python/cssutils-0.9.9
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/lxml-3.2.1
-	>=dev-python/mechanize-0.1.11
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.9.6[X,svg,webkit]
+	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
+	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
+	dev-python/netifaces[python_targets_python2_7(-)]
+	dev-python/python-dateutil[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
+	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
+	>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
+	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
+	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt4-4.9.6[X,svg,webkit,python_targets_python2_7(-)]
 	dev-qt/qtdbus:4=
 	dev-qt/qtsvg:4=
 	media-fonts/liberation-fonts
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	>=media-libs/libmtp-1.1.5:=
 	virtual/libusb:1=
-	virtual/python-imaging
+	virtual/python-imaging[python_targets_python2_7(-)]
 	>=x11-misc/xdg-utils-1.0.2-r2"
 
 RDEPEND="${COMMON_DEPEND}
@@ -102,13 +102,18 @@ src_prepare() {
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
 
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py || die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
 	# no_updates: do not annoy user with "new version is availible all the time
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
 	# C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized
 	epatch \
-		"${FILESDIR}/${P}-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${FILESDIR}/${P}-C-locale.patch"
+		"${FILESDIR}/${PN}-1.34-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
 }
 
 src_install() {
diff --git a/app-text/calibre/files/calibre-1.34-C-locale.patch b/app-text/calibre/files/calibre-1.34-C-locale.patch
deleted file mode 100644
index 6a91d942bf90..000000000000
--- a/app-text/calibre/files/calibre-1.34-C-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/calibre/spell/dictionary.py	2014-05-01 11:38:04.051290252 -0400
-+++ b/src/calibre/spell/dictionary.py	2014-05-01 11:37:55.061290088 -0400
-@@ -52,7 +52,7 @@
-     raw = raw or ''
-     parts = raw.replace('_', '-').split('-')
-     lc = canonicalize_lang(parts[0])
--    if lc is None:
-+    if lc is None and raw != 'C':
-         raise ValueError('Invalid language code: %r' % raw)
-     cc = None
-     if len(parts) > 1:
diff --git a/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild b/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild
index 23ff5f6e4081..c3f458d4d3cf 100644
--- a/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild
+++ b/app-text/mate-doc-utils/mate-doc-utils-1.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/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild,v 1.5 2014/05/02 12:24:31 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild,v 1.6 2014/05/04 14:53:07 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="${PYTHON_DEPS}
 	app-text/rarian:0
diff --git a/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild b/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild
index 8d0f7543a641..89013cc1aa2f 100644
--- a/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild
+++ b/app-text/mate-document-viewer/mate-document-viewer-1.6.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/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild,v 1.1 2014/03/31 19:50:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild,v 1.2 2014/05/04 14:53:11 ago Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="caja dbus debug djvu dvi +introspection gnome-keyring +ps t1lib tiff xps"
 
diff --git a/app-text/ocrad/ocrad-0.22.ebuild b/app-text/ocrad/ocrad-0.22.ebuild
index 1e48b3d84d0b..f2dfda623732 100644
--- a/app-text/ocrad/ocrad-0.22.ebuild
+++ b/app-text/ocrad/ocrad-0.22.ebuild
@@ -1,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/ocrad/ocrad-0.22.ebuild,v 1.2 2014/04/29 09:12:03 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ocrad-0.22.ebuild,v 1.3 2014/05/04 08:30:51 ago Exp $
 
 EAPI=5
 inherit unpacker toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-vim/bash-support/bash-support-4.1.ebuild b/app-vim/bash-support/bash-support-4.1.ebuild
index 661d4ca65548..7db8c39af4c6 100644
--- a/app-vim/bash-support/bash-support-4.1.ebuild
+++ b/app-vim/bash-support/bash-support-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/app-vim/bash-support/bash-support-4.1.ebuild,v 1.2 2014/04/11 19:46:17 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/bash-support/bash-support-4.1.ebuild,v 1.3 2014/05/04 08:24:32 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Bash-IDE - Write and run bash scripts using menus and hotkeys"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=365"
 LICENSE="public-domain"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}"
 
diff --git a/dev-cpp/rudiments/Manifest b/dev-cpp/rudiments/Manifest
index 338fc8a7dfa6..9097f199c724 100644
--- a/dev-cpp/rudiments/Manifest
+++ b/dev-cpp/rudiments/Manifest
@@ -1,3 +1,2 @@
-DIST rudiments-0.31.tar.gz 834376 SHA256 c35b69e918bad831e17edbab866c22eff11d083531bf0e15dafddb003f9c16d2 SHA512 1933ef21ce83c52c607cf513fd41c615cb8a9cd887ce6d7a4a5b3ea6a159893f6b40812ff6279baf9249dd35386c00a55641f4eece875c652578a92969eb1132 WHIRLPOOL ac10ccbd7fbc611f99cc828f40f3b8caebd46023b7075c81afd53e132689e2c40e0aecf4401346c57630bf4e215db8ea72108fbe8928972578fa98f024a6173a
-DIST rudiments-0.32.tar.gz 668202 SHA256 aa3f3790b1b154201265c292d8e7c977fe6ca009a9ae557133a27c1e8d218fbe SHA512 d1b8d1df0fe046592152a7ff801f333a5f1cc6b7ee5ad6c8b944b6c29be5cb48169c5da9523da0b6ae4147a1b1a405f497e9aeee21ae04e5328f5f5771bda545 WHIRLPOOL 19e0defb10fb37c6b46f35cd33559524ca58fe6276520ba70103b45529af7a9eb22a11e964edfa45d4ac714bedbc0dbcaf672c3c4b6f18541f49ec57fd670f1c
 DIST rudiments-0.40.tar.gz 1469860 SHA256 763466daed63dd26553b198816626e702d8677fdb7f91786c1a1dbd4f704c044 SHA512 2d35b9c83a333865c69fafd260eea1f85e523df213b826bd0ed9796af688f4bfd97fda5353b17f6145b11ce37853a48b793a95b353b78822b365119ede023470 WHIRLPOOL 03cc2a7f48a7e5deae2dc095c8138fdba30ad9bfa486f7bc1e3276b5310cec368e43815a13139d40ce8936037ca4eec89ed1ec3254aecfe7c0b1671e6e771824
+DIST rudiments-0.46.tar.gz 1732565 SHA256 b59b830af52cdf5a361d73524efa0a7aa2f804011e07bf3855551ad07273d70a SHA512 2248db71c23ced4344dbdd26e9efe8c45f20da2e8e106101c762b334b8797dc62c47621c0477d42ac06fc665aa91b772e959802b10103c6256d1dbc68418f2f1 WHIRLPOOL 96cd3e778dbf2d52dc66b5c9ac02358ffd8409eb1ddc4dca5cb6327d5e962445763e1fea9d32bd01955a248f3391d3873bc48570e77bb2543d4cea9b4171fe15
diff --git a/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch b/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch
new file mode 100644
index 000000000000..60710f0a95b2
--- /dev/null
+++ b/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch
@@ -0,0 +1,88 @@
+diff --git a/config.mk.in b/config.mk.in
+index ae29f27..c0b7e3d 100644
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -11,7 +11,7 @@ includedir = @includedir@
+ libdir = @libdir@
+ mandir = @mandir@
+ datadir = @datadir@
+-docdir = ${datadir}/doc/rudiments
++docdir = @docdir@
+ 
+ # compiler to use
+ CC = @CC@
+@@ -21,7 +21,7 @@
+ AR = @AR@
+ 
+ # includes and defines
+-BASECPPFLAGS = @WALL@ @WERROR@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@
++BASECPPFLAGS = @WALL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@
+ 
+ # debug and optimization flags (-g, -O2, etc.)
+ # NOTE: -FPIC gets added if we're not using libtool
+diff --git a/configure.in b/configure.in
+index d82ea0e..290a80b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -28,7 +28,7 @@ AC_ARG_WITH(pthread-prefix,
+ 	PTHREADPATH="")
+ AC_ARG_ENABLE(ssl,
+ 	[  --disable-ssl           Disable SSL support],
+-	ENABLE_RUDIMENTS_SSL="no",
++	ENABLE_RUDIMENTS_SSL="$enableval",
+ 	ENABLE_RUDIMENTS_SSL="yes")
+ AC_ARG_WITH(ssl-includes,
+ 	[  --with-ssl-includes     SSL includes],
+@@ -40,7 +40,7 @@ AC_ARG_WITH(ssl-libs,
+ 	SSLLIBS="")
+ AC_ARG_ENABLE(pcre,
+ 	[  --disable-pcre          Don't use PCRE for regular expressions],
+-	ENABLE_RUDIMENTS_PCRE="no",
++	ENABLE_RUDIMENTS_PCRE="$enableval",
+ 	ENABLE_RUDIMENTS_PCRE="yes")
+ AC_ARG_WITH(pcre-includes,
+ 	[  --with-pcre-includes    PCRE includes],
+@@ -56,7 +56,7 @@ AC_ARG_ENABLE(built-in-regex,
+ 	USE_BUILT_IN_REGULAREXPRESSION="0")
+ AC_ARG_ENABLE(threads,
+ 	[  --disable-threads       Disable thread support],
+-	ENABLE_RUDIMENTS_THREADS="no"; INCLUDE_THREAD="0"; INCLUDE_THREADMUTEX="0",
++	ENABLE_RUDIMENTS_THREADS="$enableval"; INCLUDE_THREAD="0"; INCLUDE_THREADMUTEX="0",
+ 	ENABLE_RUDIMENTS_THREADS="yes")
+ 
+ dnl   options to disable building various classes
+@@ -3716,6 +3716,10 @@ if ( test "`echo $datadir | cut -c1`" = "/" )
+ then
+ 	datadir='${DESTDIR}'"$datadir"
+ fi
++if ( test "`echo $docdir | cut -c1`" = "/" )
++then
++	docdir='${DESTDIR}'"$docdir"
++fi
+ 
+ 
+ dnl Output files.
+diff --git a/src/Makefile.in b/src/Makefile.in
+index a224d83..3b990fb 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -4,7 +4,7 @@ include ../config.mk
+ 
+ .PHONY: all clean install uninstall
+ 
+-CPPFLAGS = $(WERROR) $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@
++CPPFLAGS = $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@
+ 
+ SRCS = namevaluepairs.cpp winsock.cpp @SRCS@
+ LOBJS = namevaluepairs.lo winsock.lo @LOBJS@
+--- a/acsite.m4	2014-05-04 01:44:03.265919456 +0400
++++ b/acsite.m4	2014-05-04 01:44:34.008920936 +0400
+@@ -266,7 +237,7 @@
+ 	dnl Sometimes -Wall includes -Wunused-variables and -Wunused-parameters
+ 	dnl which we don't care about.  Disable it if it does.
+ 	OLDCPPFLAGS=$CPPFLAGS
+-	CPPFLAGS="$WALL $WERROR $CPPFLAGS"
++	CPPFLAGS="$WALL $CPPFLAGS"
+ 	AC_MSG_CHECKING(whether -Wall includes -Wunused-*)
+ 	AC_TRY_COMPILE([void f(int a) { return; }],[f(1);],AC_MSG_RESULT(no),WALL=""; AC_MSG_RESULT(yes))	
+ 	CPPFLAGS=$OLDCPPFLAGS
diff --git a/dev-cpp/rudiments/rudiments-0.31.ebuild b/dev-cpp/rudiments/rudiments-0.31.ebuild
deleted file mode 100644
index 5a2ff75672c3..000000000000
--- a/dev-cpp/rudiments/rudiments-0.31.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/rudiments-0.31.ebuild,v 1.1 2008/04/04 01:10:49 halcy0n Exp $
-
-DESCRIPTION="C++ class library for daemons, clients and servers"
-HOMEPAGE="http://rudiments.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rudiments/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="debug pcre ssl"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-		ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# It's a buggy configure-script
-	# We can only disable, but not enable
-	local options
-	use pcre || options="${options} --disable-pcre"
-	use ssl || options="${options} --disable-ssl"
-	econf \
-		$(use_enable debug) \
-		${options} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${D}/usr/share/doc/${PF}/html" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-cpp/rudiments/rudiments-0.32.ebuild b/dev-cpp/rudiments/rudiments-0.32.ebuild
deleted file mode 100644
index 53c0ec95710a..000000000000
--- a/dev-cpp/rudiments/rudiments-0.32.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/rudiments-0.32.ebuild,v 1.1 2009/05/19 13:55:46 matsuu Exp $
-
-DESCRIPTION="C++ class library for daemons, clients and servers"
-HOMEPAGE="http://rudiments.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rudiments/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug pcre ssl"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# It's a buggy configure-script
-	# We can only disable, but not enable
-	local options
-	use pcre || options="${options} --disable-pcre"
-	use ssl || options="${options} --disable-ssl"
-	econf \
-		$(use_enable debug) \
-		${options} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${D}/usr/share/doc/${PF}/html" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-cpp/rudiments/rudiments-0.46.ebuild b/dev-cpp/rudiments/rudiments-0.46.ebuild
new file mode 100644
index 000000000000..6b9973f071dc
--- /dev/null
+++ b/dev-cpp/rudiments/rudiments-0.46.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/rudiments/rudiments-0.46.ebuild,v 1.1 2014/05/03 22:40:26 pinkbyte Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils
+
+DESCRIPTION="C++ class library for daemons, clients and servers"
+HOMEPAGE="http://rudiments.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rudiments/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug pcre ssl static-libs"
+
+DEPEND="pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="/usr/share/doc/${PF}/html" \
+		$(use debug && "--enable-debug") \
+		$(use_enable pcre) \
+		$(use_enable ssl)
+	)
+	autotools-utils_src_configure
+}
diff --git a/dev-db/barman/Manifest b/dev-db/barman/Manifest
index b84aa0790c7e..b086f8d49517 100644
--- a/dev-db/barman/Manifest
+++ b/dev-db/barman/Manifest
@@ -1,3 +1,4 @@
 DIST barman-1.2.1.tar.gz 70413 SHA256 7389b7c7e532e4b67adc2f606c74fcbdd3dc0c7284c16256da9a0e0a3a4f8060 SHA512 044b87570262ca8ac953ead93c87c1f75bea68214b6417a88e9d8df0af7feae9b22c77f695cfda89a555982d2c65dfe8fb212d18ab399828ddd8f883c8c49016 WHIRLPOOL 018cf64473ea22fcdadeb4c0fbb6e477a9bf2f08d99e1174a9252bd9482bc06d61c2f228666e6ac140b749f2576712cd7d82d1e0ee86583d7553abf456fc70cd
 DIST barman-1.2.2.tar.gz 70412 SHA256 fd4f941bab62f5875ecf238a90f5ad05a59622f3bea88265ee483629112ef366 SHA512 7603e2b0387331e044283445943317f44d2c0fd20dcb44364d506ec966b61b5d31aeaf49ba81bac66d137a4747393676de5ff74894034aa6e26c19d5d2589b8f WHIRLPOOL a1a65077b7fb3975cf20b49a8abb06adb9fc7bd72628185c2a744d1185997361566bd792c0ac3b884c01f1a0b2156ffbbbacbd41cc17458c245490d6f206eba6
 DIST barman-1.2.3.tar.gz 70189 SHA256 3ea69770345c886111054aa37d5eb2dad7a191eef131c14f8db5e7517cfb03d7 SHA512 005e064a620af21aa21096669b03a9b85c2e29547293562a9151f62c786d7a53d7a0e3a3bc159a9211c319994e1cf1eb6cd564c923179c02b094f30ceb105084 WHIRLPOOL 6a4b5f6e0f125c8dffaaca25d3c98ba4ef8bc67878af395a4a2c7ebb1f962e12e6beb9857dfb307bf960a700074738614f016ee31fe89bace4a97f78b277705f
+DIST barman-1.3.0.tar.gz 86708 SHA256 732433c7f82627525208b9171f4b306ff6b62a2ae31382ef9430429dc6444f26 SHA512 7a215fdae67b11a821f9c047d095778f8bff83cb7342687ecf3f21c85a7fbc1c4d78f4807a656a2733a01c1ce53160b5c63f615de8091a0ac0c1c9e16a8480c7 WHIRLPOOL f8e9f9a8adb23d0933e17bb596eb611d1d397de333953dda66f41332a1b8df01cf58c81540b7ceb26992164e6b14ef8f3c8334e9f66bd166b84023437aa35dd8
diff --git a/dev-db/barman/barman-1.3.0.ebuild b/dev-db/barman/barman-1.3.0.ebuild
new file mode 100644
index 000000000000..ad9eb4c16ac3
--- /dev/null
+++ b/dev-db/barman/barman-1.3.0.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-db/barman/barman-1.3.0.ebuild,v 1.1 2014/05/03 05:21:28 patrick Exp $
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7})
+
+inherit distutils-r1
+
+DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
+
+HOMEPAGE="http://www.pgbarman.org"
+SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="dev-python/argh[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	net-misc/rsync
+	dev-db/postgresql-server"
+DEPEND=""
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index a247d12b459f..e7a0bf7f5507 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -6,3 +6,4 @@ DIST redis-2.8.5.tar.gz 1050480 SHA256 2741bf67093e38ec23494f0882794160f01e9f34a
 DIST redis-2.8.6.tar.gz 1052017 SHA256 efd0c9cb8d2696db44d8cb8309fed96607f68b93bb126615e64bff364e716658 SHA512 55949b27ca1cdb7d865ad3eb25a3ee280b2cbbbbb1f806f5ec7fe1d6541d6a64ec97a5e1ba2384deaf1a5e8ef60f004c0d63fc5fc71527dff8b47f44b828a6a0 WHIRLPOOL 23b19581adef3434f356d4ad6a7e77e9a6009ea7fc1796d27a434f1e90f287ea43f86a6ba6cdce060edeed124c1a6d28f6838b573b3199584aece410916ba6c8
 DIST redis-2.8.7.tar.gz 1064262 SHA256 a93e352e50bcc076e649174319c2a819306735c1a1ee83d498ced146eda78670 SHA512 2c484699628f02c1e1a0637f2b62ca8a206a8771e2c9b3821a34800b5893b90890048363b4a9b1202283dee46e087a0e5e7acc0d46801b844b5217f3ca65b3d9 WHIRLPOOL 2c11d36bd86593d295e868a145a41eda1dbcbd6046e34b0f1028adf6f59f9aac17bff82741b28c7a10965007a0d11885ec5e4bcd19863e238d9d94da0db0957d
 DIST redis-2.8.8.tar.gz 1073450 SHA256 fd2be11b8d9300d35b6bbed6fcd6fa6d7ef1a72ccaeb0cc991ce44dc49908bc8 SHA512 99cf0c41feaf594c69c625dcc8a40d15d00ae5c3ec7947abdcbe969a18ff844f9d8c60ee047dfa878a23505963b972d7564a27315017cab74bc5925ecae67ab7 WHIRLPOOL be9aa6166f7dd3ef37f2451ac8a2bdaed1f7dfb1bd8b67df04addde1f0a1dd01ec12547dc290374b818bb644a2b05b88acac884f2613a92650bd312b142e7f1e
+DIST redis-2.8.9.tar.gz 1097369 SHA256 7834c37f2ff186c46aef8e4a066dfbf1d6772a285aa31c19c58162f264f1007f SHA512 f202c44e16d257e33f7fabaa3b46218bf45848158a4b8c7cc2fab119fdf42bb4e19764a2f5f82fc8c76a3e353754b6b25f2cacf20a253d28244acbf87fd6dd7a WHIRLPOOL 2d968afe427bffc69c67cf8ac7d89166b5946a701787b28587b7a1eb0007dbc5766fb8d8760eec420ff23fbbf8fbac2a2cc6fdf69145f1885b30ef341dd4cd40
diff --git a/dev-db/redis/redis-2.8.9.ebuild b/dev-db/redis/redis-2.8.9.ebuild
new file mode 100644
index 000000000000..c325a275ea9a
--- /dev/null
+++ b/dev-db/redis/redis-2.8.9.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.8.9.ebuild,v 1.1 2014/05/04 13:43:30 ultrabug Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database."
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc test"
+SLOT="0"
+
+RDEPEND="tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+DEPEND=">=sys-devel/autoconf-2.63
+	test? ( dev-lang/tcl )
+	${RDEPEND}"
+REQUIRED_USE="tcmalloc? ( !jemalloc )
+	jemalloc? ( !tcmalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+	enewgroup redis 75
+	enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.3-{shared,config}.patch
+
+	# bug 467172, 467174
+	sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die
+
+	# now we will rewrite present Makefiles
+	local makefiles=""
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
+	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoconf
+}
+
+src_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf=""
+
+	if use tcmalloc ; then
+		myconf="${myconf} USE_TCMALLOC=yes"
+	elif use jemalloc ; then
+		myconf="${myconf} JEMALLOC_SHARED=yes"
+	else
+		myconf="${myconf} MALLOC=yes"
+	fi
+
+	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+	insinto /etc/
+	doins redis.conf sentinel.conf
+	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+	fperms 0644 /etc/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd" redis
+	newinitd "${FILESDIR}/redis.initd-3" redis
+
+	systemd_dounit "${FILESDIR}/redis.service"
+	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+	nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
index de329b546729..0adb118c06ac 100644
--- a/dev-embedded/libftd2xx/Manifest
+++ b/dev-embedded/libftd2xx/Manifest
@@ -1,2 +1,3 @@
 DIST libftd2xx0.4.16.tar.gz 2124501 SHA256 84e2b90c2d553837d30d435fa5e4e353a4c051a51b50a07251cdd59ada7a4a96 SHA512 3a945bd31750dafd08cb86e875263e4fdb7a641676e91caf12420769ff12b505e34ec3a88d80dd43590d039c2ace280f166d1ebda2dcc399fb696d9f6c298f20 WHIRLPOOL 3377cf086fa62d8e363f4e5456fd180361fd47c1b0074059e5a55a2f765c936af91c15ff84c26a05df734c365771d50e68387adaf8cd083fa63dc0ae8929e641
 DIST libftd2xx0.4.16_x86_64.tar.gz 2099109 SHA256 b80233143de6b8077ade3e7d9c9819a2c0a4dbf4fd9fbff756b72d656dc611ec SHA512 e11ffa917560b6fb974092bcd89ef95f21651a3ce84d0bc7cc7647c4fe031368209db3b4ab52f8d6240ee89c2e6335e89135d4f358c4271284f8a830655608a9 WHIRLPOOL ad8bfe48e30ea20dd422cc2047bc8c06b4c9f225044fdc1fd96d3fa3876f894cea9094dfaffb1ec94c4decf2b89ebb802d7a60fd62ce3f5919b921877b7a039a
+DIST libftd2xx1.1.12.tar.gz 950540 SHA256 644951c1d7eeac05b0a648a105fd84ba14b0b20250f6b70f1a63e69d2f6b2579 SHA512 afe0a8a7ccc47eb8888346dabdbfb41e182f7dadee7a57a1c4ffce544aebe5cab45c3e64de4ebeebdc0f31961617a79cbcf11dadfebde65ee79ca38e6234995a WHIRLPOOL e56228f9c42aebeb0c425ea20a89466ac07615a943e9ddb7585762315a581026a1e59df60ed0813c78b8a28842728545276dc3c697a6c9624b66ef8fc3e08a7a
diff --git a/dev-embedded/libftd2xx/libftd2xx-1.1.12.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.1.12.ebuild
new file mode 100644
index 000000000000..45a6e37d1324
--- /dev/null
+++ b/dev-embedded/libftd2xx/libftd2xx-1.1.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftd2xx/libftd2xx-1.1.12.ebuild,v 1.1 2014/05/04 11:20:55 hwoarang Exp $
+
+EAPI=5
+inherit multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Library that allows a direct access to a USB device"
+HOMEPAGE="http://www.ftdichip.com/Drivers/D2XX.htm"
+SRC_URI="http://www.ftdichip.com/Drivers/D2XX/Linux/${MY_P}.tar.gz"
+
+LICENSE="FTDI LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+QA_PREBUILT="*"
+
+S=${WORKDIR}
+
+src_install() {
+
+	use amd64 && cd "${S}"/release/build/x86_64
+	use x86 && cd "${S}"/release/build/i386
+
+	into /opt
+	dolib.so ${PN}.so.${PV}
+	dosym ${PN}.so.${PV} /opt/$(get_libdir)/${PN}.so.${PV:0:1}
+	dosym ${PN}.so.${PV:0:1} /opt/$(get_libdir)/${PN}.so
+	insinto /usr/include
+	doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h
+
+	dodir /etc/env.d
+	echo "LDPATH=\"/opt/$(get_libdir)\"" > ${D}/etc/env.d/50libftd2xx || die
+	if use examples ; then
+		find sample lib_table '(' -name '*.so' -o -name '*.[oa]' ')' -exec rm -f {} +
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+		insinto /usr/share/doc/${PF}/sample
+		doins -r lib_table
+	fi
+
+	dodoc "${S}"/release/ReadMe.txt
+}
diff --git a/dev-embedded/libftd2xx/metadata.xml b/dev-embedded/libftd2xx/metadata.xml
index c66696546125..11dd73f4383c 100644
--- a/dev-embedded/libftd2xx/metadata.xml
+++ b/dev-embedded/libftd2xx/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>proxy-maintainers</herd>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
+	<email>brendan@horan.hk</email>
+	<name>Brendan Horan</name>
+	<description>Proxy maintainer. Assign bugs to him</description>
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 8f16fe14a093..292c192f95d7 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -2,8 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dev-embedded</herd>
+<maintainer>
+	<email>fercerpav@gmail.com</email>
+	<name>Paul Fertser</name>
+	<description>Upstream contact. CC him on bugs</description>
+</maintainer>
 <use>
   <flag name='blaster'>Enable support for Altera USE-Blaster</flag>
+  <flag name='cmsis-dap'>Support for CMSIS-DAP compliant adapters</flag>
   <flag name="dummy">Build the dummy port driver</flag>
   <flag name="minidriver">Build the dummy minidriver</flag>
   <flag name='ftd2xx'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
diff --git a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
index 669b130620ba..fb6b42f8e77e 100644
--- a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
+++ b/dev-embedded/openocd/openocd-0.8.0_rc2.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-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.1 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.3 2014/05/04 10:42:51 hwoarang Exp $
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
@@ -22,53 +22,34 @@ fi
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
 HOMEPAGE="http://openocd.sourceforge.net"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-# Pull both libusb:0 and libusb:1 because some device need the former
-# others need the later etc.
-DEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.73
+	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi )"
 
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch_user
 
 	if [[ ${PV} == "9999" ]] ; then
-		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
-
-	# Disable craptastic build settings.
-	sed -i \
-		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
-		configure || die
-
-	if use ftdi ; then
-		local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)"
-		# Use libftdi-1 paths #460916
-		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
-		sed -i \
-			-e "s:-lftdi -lusb:${libs}:" \
-			configure src/Makefile.in || die
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
-	fi
 }
 
 src_configure() {
 	# Here are some defaults
 	local myconf=(
 		--enable-buspirate
-		--enable-ioutil
 		--disable-werror
 		--disable-internal-jimtcl
 		--enable-amtjtagaccel
@@ -77,12 +58,16 @@ src_configure() {
 		--enable-gw16012
 		--enable-oocd_trace
 		--enable-arm-jtag-ew
+		--enable-sysfsgpio
+		--enable-bcm2835gpio
 	)
 
 	# Adapters requiring usb/libusb-1.X support
 	if use usb; then
 		myconf+=(
 			--enable-aice
+			--enable-usb-blaster-2
+			--enable-ftdi
 			--enable-ti-icdi
 			--enable-ulink
 			--enable-osbdm
@@ -92,42 +77,47 @@ src_configure() {
 			--enable-rlink
 			--enable-stlink
 			--enable-vsllink
-			--enable-arm-jtag-ew
+			--enable-armjtagew
 			$(use_enable verbose-io verbose-usb-io)
 			$(use_enable verbose-io verbose_usb_comms)
 		)
 	else
 		myconf+=(
 			--disable-aice
-			--disable-stlink
+			--disable-usb-blaster-2
+			--disable-ftdi
 			--disable-ti-icdi
 			--disable-ulink
 			--disable-osbdm
 			--disable-opendous
+			--disable-usbprog
+			--disable-jlink
+			--disable-rlink
+			--disable-stlink
+			--disable-vsllink
+			--disable-armjtagew
 		)
 	fi
 
-	if use blaster; then
+	if use ftdi; then
 		myconf+=(
-			--enable-usb_blaster_libftdi
-			--enable-usb-blaster-2
+			--enable_usb_blaster_libftdi
+			--enable-openjtag_ftdi
+			--enable-presto_libftdi
 		)
 	else
 		myconf+=(
+			--disable-openjtag_ftdi
+			--disable-presto_libftdi
 			--disable-usb_blaster_libftdi
-			--disable-usb-blaster-2
 		)
 	fi
 
 	econf \
 		$(use_enable dummy) \
-		$(use_enable ftdi) \
-		$(use_enable minidriver minidriver-dummy) \
+		$(use_enable cmsis-dap) \
 		$(use_enable parport) \
 		$(use_enable parport parport_ppdev) \
-		$(use_enable parport parport_giveio) \
-		$(use_enable presto presto_libftdi) \
-		$(use_enable segger jlink) \
 		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }
@@ -135,4 +125,5 @@ src_configure() {
 src_install() {
 	default
 	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+	udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
 }
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 592a7bf44d03..2887231ebb1f 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.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-embedded/openocd/openocd-9999.ebuild,v 1.33 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.35 2014/05/04 10:42:51 hwoarang Exp $
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
@@ -22,53 +22,34 @@ fi
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
 HOMEPAGE="http://openocd.sourceforge.net"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-# Pull both libusb:0 and libusb:1 because some device need the former
-# others need the later etc.
-DEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.73
+	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi )"
 
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch_user
 
 	if [[ ${PV} == "9999" ]] ; then
-		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
-
-	# Disable craptastic build settings.
-	sed -i \
-		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
-		configure || die
-
-	if use ftdi ; then
-		local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)"
-		# Use libftdi-1 paths #460916
-		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
-		sed -i \
-			-e "s:-lftdi -lusb:${libs}:" \
-			configure src/Makefile.in || die
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
-	fi
 }
 
 src_configure() {
 	# Here are some defaults
 	local myconf=(
 		--enable-buspirate
-		--enable-ioutil
 		--disable-werror
 		--disable-internal-jimtcl
 		--enable-amtjtagaccel
@@ -77,12 +58,16 @@ src_configure() {
 		--enable-gw16012
 		--enable-oocd_trace
 		--enable-arm-jtag-ew
+		--enable-sysfsgpio
+		--enable-bcm2835gpio
 	)
 
 	# Adapters requiring usb/libusb-1.X support
 	if use usb; then
 		myconf+=(
 			--enable-aice
+			--enable-usb-blaster-2
+			--enable-ftdi
 			--enable-ti-icdi
 			--enable-ulink
 			--enable-osbdm
@@ -92,42 +77,47 @@ src_configure() {
 			--enable-rlink
 			--enable-stlink
 			--enable-vsllink
-			--enable-arm-jtag-ew
+			--enable-armjtagew
 			$(use_enable verbose-io verbose-usb-io)
 			$(use_enable verbose-io verbose_usb_comms)
 		)
 	else
 		myconf+=(
 			--disable-aice
-			--disable-stlink
+			--disable-usb-blaster-2
+			--disable-ftdi
 			--disable-ti-icdi
 			--disable-ulink
 			--disable-osbdm
 			--disable-opendous
+			--disable-usbprog
+			--disable-jlink
+			--disable-rlink
+			--disable-stlink
+			--disable-vsllink
+			--disable-armjtagew
 		)
 	fi
 
-	if use blaster; then
+	if use ftdi; then
 		myconf+=(
-			--enable-usb_blaster_libftdi
-			--enable-usb-blaster-2
+			--enable_usb_blaster_libftdi
+			--enable-openjtag_ftdi
+			--enable-presto_libftdi
 		)
 	else
 		myconf+=(
+			--disable-openjtag_ftdi
+			--disable-presto_libftdi
 			--disable-usb_blaster_libftdi
-			--disable-usb-blaster-2
 		)
 	fi
 
 	econf \
 		$(use_enable dummy) \
-		$(use_enable ftdi) \
-		$(use_enable minidriver minidriver-dummy) \
+		$(use_enable cmsis-dap) \
 		$(use_enable parport) \
 		$(use_enable parport parport_ppdev) \
-		$(use_enable parport parport_giveio) \
-		$(use_enable presto presto_libftdi) \
-		$(use_enable segger jlink) \
 		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }
@@ -135,4 +125,5 @@ src_configure() {
 src_install() {
 	default
 	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+	udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
 }
diff --git a/dev-embedded/srecord/Manifest b/dev-embedded/srecord/Manifest
index 42965ab97f44..78b3a2ce4889 100644
--- a/dev-embedded/srecord/Manifest
+++ b/dev-embedded/srecord/Manifest
@@ -2,3 +2,4 @@ DIST srecord-1.59.tar.gz 889036 SHA256 97d441ee62b948a47935adfab8b8fb01a7a654b16
 DIST srecord-1.60.tar.gz 900389 SHA256 f579671c5ff3333e711616f738e751c742c2b4dd7f7553c90c37c9b6d4968d98 SHA512 12fe45e2a605268febd7cf2c41e262a57ff77ae3e1ffe84955d39a54ac6cd27175e376e861c8ed3f8025e691bd74b993117b79f7199a45c443c575fc22fe591a WHIRLPOOL 447d9c58d4af4291a634a3d0c2555a8643c624b3998af7d4d6d7e12785e3a1440e83f29e51b9ef446e3137e25bfbf15d423fc4821fef599e972d5cb2370848c0
 DIST srecord-1.61.tar.gz 916174 SHA256 b68d47b17ae50aee68655bb3b24e6d2434754a184d16510d4a6411d10bbdc364 SHA512 9bcd310bf812cf236a6b88e0aa5979510fc3fdcb622b631e923909ac12b9ff88ab8bc1f44006f0cdbffb51cb44e5885b46ff209bac9d71428f786d7d25a160ad WHIRLPOOL 4f2b8cd938be4a8026fc31e4a7b0d6618ee58f85aa0d2fea7fa9902b03c74ba043faf725e0ae7eec960ed2d2c342d554f46fa2ca640c14fb7c29812ad203bd47
 DIST srecord-1.62.tar.gz 921920 SHA256 04a4e18a43d1cb8fa608242a012b99a1bf85704915663f668c7cd55435accb2d SHA512 4a3dde671af959c24a12c711919e9028a22034d2ce347cfa0ecb7bc368036b21b38356156ff1e2d58a9fa1a0fece25e7913be5730e23c74a82734bc262cc2c88 WHIRLPOOL dd8916b2733d4cb57b9a321acc6ff0abc5e5b23c8eb864722f146a005e3719361b9e226d16393e4fcba875fa035d8347314bc00445d96e95f08302e0c3ca2483
+DIST srecord-1.63.tar.gz 938068 SHA256 78fec76d04424506e319f59b19a520428a7449ed087a67e1779fa2996992bf1a SHA512 6c6b37b3ff2dac06d1e6bac40cf29a3b8b6f120ccf97f7211fb6a5bd31ecbabb7cbebe98c7bbb61e2571bb9239d759a2784e426615747a7b91e089338058af2f WHIRLPOOL dfee24f2be5e076c76c00fc5bd06f225bc24e3fe0b47a0bf6a29f8cb58035d601374c7e1d5d11c365690887f1ba3a2ae400b5a1d8062d8b22e927625a4014419
diff --git a/dev-embedded/srecord/srecord-1.63.ebuild b/dev-embedded/srecord/srecord-1.63.ebuild
new file mode 100644
index 000000000000..357870561a5e
--- /dev/null
+++ b/dev-embedded/srecord/srecord-1.63.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/srecord-1.63.ebuild,v 1.1 2014/05/03 08:46:36 radhermit Exp $
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="A collection of powerful tools for manipulating EPROM load files"
+HOMEPAGE="http://srecord.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="dev-libs/libgcrypt:0"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	sys-apps/groff
+	test? ( app-arch/sharutils )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.57-libtool.patch
+
+	cp etc/configure.ac "${S}"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild
index 167a6be559d5..2589e83f970b 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild
@@ -1,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-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild,v 1.2 2014/04/01 19:00:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild,v 1.4 2014/05/03 14:44:01 zlogene Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-java/headius-options/Manifest b/dev-java/headius-options/Manifest
new file mode 100644
index 000000000000..4f3f6e75c755
--- /dev/null
+++ b/dev-java/headius-options/Manifest
@@ -0,0 +1 @@
+DIST headius-options-1.1.tar.gz 6590 SHA256 ada43b0f2b73a83fb09f5e09c8f50590357b8e2ea39f9f1d8bc030b7353ced3d SHA512 561be8ecf02e132436a94bf60595d66839c8e86f49c6a121f8714403fea6d22369f46dbfb15b7834a8430ac6aeaddf4e6aca5b0998c51e3b7ad71c60ac6c1bf4 WHIRLPOOL e82a084850c0c9037af4344ac0477e34ae869be8924342071e2cf76aa8edce2fc3fd4960c78e572b8dbc7aefd5871d686918b81ba5672c5d2deaf79c1193f291
diff --git a/dev-java/headius-options/files/headius-options-1.1-build.xml b/dev-java/headius-options/files/headius-options-1.1-build.xml
new file mode 100644
index 000000000000..2b3e6f661127
--- /dev/null
+++ b/dev-java/headius-options/files/headius-options-1.1-build.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 5/3/14 9:10 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="options-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="options-1.1"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.11"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.11/junit-4.11.jar" 
+         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar" 
+         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
+         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/headius-options/headius-options-1.1.ebuild b/dev-java/headius-options/headius-options-1.1.ebuild
new file mode 100644
index 000000000000..ecbc28c0a824
--- /dev/null
+++ b/dev-java/headius-options/headius-options-1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/headius-options/headius-options-1.1.ebuild,v 1.1 2014/05/03 19:22:31 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A small library for managing sets of JVM properties"
+HOMEPAGE="https://github.com/headius/options"
+SRC_URI="https://github.com/headius/options/archive/options-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+S="${WORKDIR}/options-options-${PV}"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_GENTOO_CLASSPATH="ant-junit junit-4"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/options-${PV}.jar
+
+	dodoc README.md
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/com
+}
\ No newline at end of file
diff --git a/gnome-extra/evolution-kolab/metadata.xml b/dev-java/headius-options/metadata.xml
similarity index 87%
rename from gnome-extra/evolution-kolab/metadata.xml
rename to dev-java/headius-options/metadata.xml
index da6fd63d0085..95a67909c7b5 100644
--- a/gnome-extra/evolution-kolab/metadata.xml
+++ b/dev-java/headius-options/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<herd>java</herd>
 </pkgmetadata>
+
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 844586cb95e6..f60d5bab0d0c 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -10,4 +10,5 @@ DIST jdk-7u25-apidocs.zip 60766618 SHA256 fe99e1b909a9d877fb30c49732a2dcc0a1cc31
 DIST jdk-7u40-apidocs.zip 60408160 SHA256 50d5f39fa2dea1df3ee6df88d13a298a7b82e4054dca3ef967df894a3d6968c9 SHA512 455a60a9c87126a8b0e1e0f11b63a4e58d9b538f0d92eeed705f069ddfb5ab87474bef304e046ac2af19a0b84282ab56dff563f076738623a4a452bc4ca03c71 WHIRLPOOL f82488110ae63f89a3da87c924de3ee22e6f80401ddb2619a6e53e2dc57df706280d575c5f311d6e206c74f1dc7498daccd3bfdc445c52326fb7457ec43f4991
 DIST jdk-7u45-apidocs.zip 61019770 SHA256 9033a294be366e222c227303b02261b5a0243306de6133db89340c63f83edc8d SHA512 2716ef41d06b421c3cdae553727a0200fcd1a8b655ac5468420cd2afc710d7c4379a9c028540ad87011eeb36ad28a9871cc3a57587235ab4702d2ec8a01cc34c WHIRLPOOL a0f9c3382d75bf6d9f7cbed7f52332dba38aa8c3656d1eef8fa8a3acb474e409ca072a6bbd5ca73c4f18546d2694d6265ff438428e9156058b38cc14ab7d0b62
 DIST jdk-7u51-apidocs.zip 61116819 SHA256 01f567699e9152009505cefa7267b7ac68138aaf1c9d85f16155f2ab30c2bec4 SHA512 31bbe1ef7c48fab381063a937b14b296147d1045a8b41c4cedc4c130965af746cea41e1ee91117fec3b20c1fc04e5917a4c97f1329f01675441f224794213bc3 WHIRLPOOL 7347efb5a36b7de81f2685a3e335e5af92d168c90fd85ced18591bc2fcb8a1e427ccd5ad1726434e420674e27c041d0113960a3ba533546235b529e92ccfe061
+DIST jdk-7u55-apidocs.zip 61123597 SHA256 f5c5a7cc33c45e5b7442076465c5a934bf44d006cdfcff080d7ed00bdf5845e4 SHA512 a7c38a0882aa694552ceb7e50162b75ab2bdcfcaddd0d4f1a730f4fdf70fe55d92076ec237ae756aa7ba7ae62d57d0e0b2e6caee8db6a1864316ceb247dfc5db WHIRLPOOL f2f751fcdb4a2a324c75b1697be526404829d9a4dee7e9a7d8923ebb3c97a51a80d49edaec3c48c3c50f1c8c6992467fc334d307b1667903b4755de78131f11f
 DIST jdk-8-apidocs.zip 88317932 SHA256 3de88cc21051c3a2e94a7def9e937208fec94ed1423dcf7611e26b8a28f00b45 SHA512 2edda9d73ad23e64abbdb5b2363342dc1542d49f04614fac36f5bbec29109e51dfdcec970dad68da7ced75584109c6d29b62c16c37fcce86a504560d2524a45d WHIRLPOOL c013e840759df220686e73d118dd7abf94ff1c1a8d37576f1023d3baac49c724769ade56d62af87a48da308b0fcad97be99a2842f4fc08b11ed9844d808f9b58
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.55.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.55.ebuild
new file mode 100644
index 000000000000..06b4cde6a9c7
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.55.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.55.ebuild,v 1.1 2014/05/03 23:24:42 tomwij Exp $
+
+EAPI=5
+
+inherit versionator
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
+ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/7/docs/"
+SRC_URI="${ORIG_NAME}"
+
+LICENSE="oracle-java-documentation-7"
+SLOT="1.7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${ORIG_NAME} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(agree to the license) and place it in ${DISTDIR}"
+
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report to the bug 67266 (link below)."
+	einfo "If emerge fails because of a checksum error it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install(){
+	insinto /usr/share/doc/${P}/html
+	doins index.html
+
+	for i in *; do
+		[[ -d $i ]] && doins -r $i
+	done
+}
diff --git a/dev-java/jcodings/Manifest b/dev-java/jcodings/Manifest
index 801789bd0024..8294d33c259b 100644
--- a/dev-java/jcodings/Manifest
+++ b/dev-java/jcodings/Manifest
@@ -1,3 +1,4 @@
+DIST jcodings-1.0.11.tar.gz 123802 SHA256 b96089463e291ae73215504eb0db876f864e394c767740fbddefac751850542f SHA512 6bff29718ff04fd2f52cff767440d87f3dcb0f4acf71ee7b037241af7ef7533284176f53d08da5b1f37c643b766f4a9113651c994d1893ef302a2056d9ff40f3 WHIRLPOOL 27d5b402a3bc822d126365f4bbc5f3dd87bbcdf69720634333f9b04c4e19ecb00a4af25e676b7b5de81a3f7debaafa8d5b14f6da3aa0583248f96d8b4b3701df
 DIST jcodings-1.0.2.tar.bz2 60478 SHA256 8b8894c61f0cb2014cafb76871de584d59295284a5aaca29eb20644485de6ac3 SHA512 ec63031fc477c01de233dec6139601017a2993e356f5e5f2305be635cb3e943a77205b5a4e7119f199091de57bea09730a7d801c543105821c2c43ff8aafaf94 WHIRLPOOL e8fb92230193250fb82b70f38f1729cdccaee8de3542b986b3fea0f29b491418867cd502a2e292b6b9e5f856f84bdea658cef5c40db11f0ac018833bd69cb7f9
 DIST jcodings-1.0.4-git.tar.gz 90294 SHA256 25332bd415cb0fa997e5f89e37d1c5ebb259629f5be5796c377e0b0624a1767e SHA512 49cdccbb27c9c6859447fa783b22dcd4fa1b9bb6fe9af3e8bddfe3ca4cd62850e4d6c51589481503dba9ea5e27139407834c9163063b74e960bf848ed4f9531e WHIRLPOOL e753dd6a0256de610f65e15eb0988b1790064175ab3027362b8399f11093f8c088399fb9348eb3717ce8bc6803bcb9bcefb2d2f61526fff2b707870ce5cfe7a5
 DIST jcodings-1.0.5-git.tar.gz 90788 SHA256 a5195911c9fc6fb911200b4939acb60ea97c70429da025b02cb03cae8e09f4c4 SHA512 a0122eea18077daefdcf38ec9e6f12b000c558837835fe900f6e0c282fdfcf95dbb10652b4cfeb32e556ae8ebe1aec8c10e4a352cdb565837b2f16335140f8e3 WHIRLPOOL f9b31545169f9539d8c3078a56c721594982b666cffedaf0541243051b1e0237d2169eb414e1105e4b6948ea86f382975d7792d0ca76cb84d9d1165cd78db497
diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11.ebuild
new file mode 100644
index 000000000000..e345d2fc0dd2
--- /dev/null
+++ b/dev-java/jcodings/jcodings-1.0.11.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-java/jcodings/jcodings-1.0.11.ebuild,v 1.1 2014/05/03 20:39:55 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Byte-based encoding support library for Java"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+java_prepare() {
+	cp "${FILESDIR}"/maven-build.xml build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/joni/Manifest b/dev-java/joni/Manifest
index 410084676c03..d8d7066c424a 100644
--- a/dev-java/joni/Manifest
+++ b/dev-java/joni/Manifest
@@ -1 +1,2 @@
 DIST joni-1.1.4.tar.gz 120701 SHA256 644f24378cffa2efe9d59c3a28616c80319693a42eeb0234550f9e1f2e8ba11e SHA512 68ac4559e3b6ac2506126af7c8159a87a7906fe45e71828478051f1a84a10b9b62c966168b260d1e0b0395cbd1792a428b2e1ac458db32b57b7a84c81f9e7804 WHIRLPOOL fce0621bf6302423c31036cb084f92455578321b940ad6b9a91f078fdadd9a94a4e0f52aeb42a9beb7fb6be3b789a54f99becf094c3a7462d3b9246edbb4967f
+DIST joni-2.1.0.tar.gz 125084 SHA256 9c8cb9abd7d8d086b777ade94a7ac68aaf7b9343720f81796d8c1a6c49e4cc39 SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e WHIRLPOOL 4f5befc5b9813fb54cf813184fd152bbe3af98c73fda0d9c89dfbc42aa7b2f621b20738c23bad0682954ff8c7566a4053173857f06dac36036d6178c8ae9b89d
diff --git a/dev-java/joni/joni-2.1.0.ebuild b/dev-java/joni/joni-2.1.0.ebuild
new file mode 100644
index 000000000000..2354a7abf0e4
--- /dev/null
+++ b/dev-java/joni/joni-2.1.0.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-java/joni/joni-2.1.0.ebuild,v 1.1 2014/05/03 20:45:45 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="Java port of the Oniguruma regular expression engine"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+CDEPEND="dev-java/asm:3
+	dev-java/jcodings:1"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="build"
+EANT_GENTOO_CLASSPATH="asm-3 jcodings-1"
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 7c0948d02316..03037526e653 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -1,2 +1,4 @@
+DIST jruby-1.7.12-mvn-ant-ant.patch 210806 SHA256 3a46445615a3b4c6dcfea5e8b1cbf00177e81516c7fd70c619812be8ae0edf98 SHA512 18ab5e9a0ca04deccfe2ffaeba54c2c79c6f17fc5277bf32b800279f5a2a1c6e62ec273276b5b951d13d78b0de7b535b651a0d564b788cd972186895a3ab96ae WHIRLPOOL 23cdec09c9cae819d184676c57cc6fe2bc01b1c1a3dd574ae264e22796624beec31b2d5f8bec195594292b7dc742427c6e8f2f2bd48fad552a3fdb2cab0a2f07
 DIST jruby-src-1.6.5.1.tar.gz 14284770 SHA256 1126f29b888b5427c2d416042a6c010849ab1d29ee9be97e592caf6859921be5 SHA512 f777e8c09e1f3e2be42a2043cf189496f826158769c0fd82a4bc6912fdbc63905905a4a32534adc156efe0c3cbb4e198077c61262fad0463b42515b8e2f96821 WHIRLPOOL 440c2a36c9862819956afbefc2e1c6af060526bf80fd31c5551cb4ab3d74f366eb95af19fd2e40208527d8d66382ea9dd80f16c165d48f3924cd8de5a850a82b
 DIST jruby-src-1.6.8.tar.gz 14709528 SHA256 7832053682bf791de7a5b062b5c8a3521ad5d6468141238551a9959649df973a SHA512 924114149bd7ce81b15c71e80cf53f4b50eb8d5220098e5ead2b447b96a6a405d93a219fb19fb7a0b9e4dc6798fd99b547b2352aabe4f84b5a694fe6760fd24d WHIRLPOOL 1f21b0899ac6c37b1e3e94aa7ef0927a720092f3a8687ba476cc70d8cd58228dbfdf1e2ea3e29414c14c329f1b6f61178ae34dd40bdf8a4c39cae5251849ac6c
+DIST jruby-src-1.7.12.tar.gz 10537791 SHA256 c10c0581abe7d55519273b91bddf9d44610baf69b875473593fd739b0c059cc7 SHA512 f68e72c37543a5301041a1700b9a3ef07ea5be43b806187f49e7ef6172315c5cd2aa4d74466273122e35b1a190f9a0fb097127c9530f48740f278ff6f87704fe WHIRLPOOL 5b82c5ac00761a62c6d319dc9ff319a5036c7b30724449149595fbaac117a2dca61bc13480db79ef85f10278607556f7091698021c3a7cfd3b1359603755e01a
diff --git a/dev-java/jruby/files/jruby-1.7.12-bash-launcher.patch b/dev-java/jruby/files/jruby-1.7.12-bash-launcher.patch
new file mode 100644
index 000000000000..2fe9eb457de0
--- /dev/null
+++ b/dev-java/jruby/files/jruby-1.7.12-bash-launcher.patch
@@ -0,0 +1,164 @@
+diff -Naur a/bin/jruby.bash b/bin/jruby.bash
+--- a/bin/jruby.bash	2014-05-03 17:55:20.665665383 +0200
++++ b/bin/jruby.bash	2014-05-03 17:58:37.095630622 +0200
+@@ -25,29 +25,7 @@
+   JAVA_VM=-client
+ fi
+ 
+-# get the absolute path of the executable
+-SELF_PATH=$(builtin cd -P -- "$(dirname -- "$0")" >/dev/null && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
+-
+-# resolve symlinks
+-while [ -h $SELF_PATH ]; do
+-    # 1) cd to directory of the symlink
+-    # 2) cd to the directory of where the symlink points
+-    # 3) get the pwd
+-    # 4) append the basename
+-    DIR=$(dirname -- "$SELF_PATH")
+-    SYM=$(readlink $SELF_PATH)
+-    SELF_PATH=$(cd $DIR && cd $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
+-done
+-
+-PRG=$SELF_PATH
+-
+-JRUBY_HOME_1=`dirname "$PRG"`           # the ./bin dir
+-if [ "$JRUBY_HOME_1" = '.' ] ; then
+-  cwd=`pwd`
+-  JRUBY_HOME=`dirname $cwd` # JRUBY-2699
+-else
+-  JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
+-fi
++JRUBY_HOME="${JRUBY_HOME:-/usr/share/jruby}"
+ 
+ if [ -z "$JRUBY_OPTS" ] ; then
+   JRUBY_OPTS=""
+@@ -79,17 +57,7 @@
+ done
+ JRUBY_OPTS=${JRUBY_OPTS_TEMP}
+ 
+-if [ -z "$JAVACMD" ] ; then
+-  if [ -z "$JAVA_HOME" ] ; then
+-    JAVACMD='java'
+-  else
+-    if $cygwin; then
+-      JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/java"
+-    else
+-      JAVACMD="$JAVA_HOME/bin/java"
+-    fi
+-  fi
+-fi
++JAVACMD=java
+ 
+ if [ -z "$JAVA_MEM" ] ; then
+   JAVA_MEM=-Xmx500m
+@@ -130,21 +98,7 @@
+ 
+ CP_DELIMITER=":"
+ 
+-# add main jruby jar to the bootclasspath
+-for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
+-    if [ ! -e "$j" ]; then
+-      continue
+-    fi
+-    if [ "$JRUBY_CP" ]; then
+-        JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j"
+-        else
+-        JRUBY_CP="$j"
+-    fi
+-    if [ $JRUBY_ALREADY_ADDED ]; then
+-        echo "WARNING: more than one JRuby JAR found in lib directory"
+-    fi
+-    JRUBY_ALREADY_ADDED=true
+-done
++JRUBY_CP="$(java-config-2 -d -p jruby)"
+ 
+ if $cygwin; then
+     JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
+@@ -152,29 +106,7 @@
+ 
+ # ----- Set Up The System Classpath -------------------------------------------
+ 
+-if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
+-    # Use same classpath propagated from parent jruby
+-    CP=$JRUBY_PARENT_CLASSPATH
+-else
+-    # add other jars in lib to CP for command-line execution
+-    for j in "$JRUBY_HOME"/lib/*.jar; do
+-        if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
+-          continue
+-        fi
+-        if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
+-          continue
+-        fi
+-        if [ "$CP" ]; then
+-            CP="$CP$CP_DELIMITER$j"
+-            else
+-            CP="$j"
+-        fi
+-    done
+-
+-    if [ "$CP" != "" ] && $cygwin; then
+-        CP=`cygpath -p -w "$CP"`
+-    fi
+-fi
++CP="${JRUBY_PARENT_CLASSPATH}"
+ 
+ if $cygwin; then
+     # switch delimiter only after building Unix style classpaths
+@@ -254,15 +186,7 @@
+         java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;;
+      # Run under JDB
+      --jdb)
+-        if [ -z "$JAVA_HOME" ] ; then
+-          JAVACMD='jdb'
+-        else
+-          if $cygwin; then
+-            JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/jdb"
+-          else
+-            JAVACMD="$JAVA_HOME/bin/jdb"
+-          fi
+-        fi 
++        JAVACMD='jdb' 
+         java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
+         JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;
+      --client)
+@@ -310,8 +234,6 @@
+ 
+ JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK"
+ 
+-JFFI_OPTS="-Djffi.boot.library.path=$JRUBY_HOME/lib/jni"
+-
+ if $cygwin; then
+   JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
+   JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
+@@ -349,8 +271,9 @@
+     JRUBY_OPTS=''
+   fi
+ 
+-  "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
++  "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
+     "-Djruby.home=$JRUBY_HOME" \
++    "-Djruby.bindir=/usr/bin" \
+     "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+     "-Djruby.shell=$JRUBY_SHELL" \
+     $java_class $JRUBY_OPTS "$@"
+@@ -372,7 +295,7 @@
+ else
+   if $cygwin; then
+     # exec doed not work correctly with cygwin bash
+-    "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
++    "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
+       "-Djruby.home=$JRUBY_HOME" \
+       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+       "-Djruby.shell=$JRUBY_SHELL" \
+@@ -385,8 +308,9 @@
+ 
+     exit $JRUBY_STATUS
+   else
+-    exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
++    exec "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
+       "-Djruby.home=$JRUBY_HOME" \
++      "-Djruby.bindir=/usr/bin" \
+       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+       "-Djruby.shell=$JRUBY_SHELL" \
+       $java_class $mode "$@"
diff --git a/dev-java/jruby/jruby-1.6.5.1.ebuild b/dev-java/jruby/jruby-1.6.5.1.ebuild
index effe497f8f4d..54a2cc0ec6f0 100644
--- a/dev-java/jruby/jruby-1.6.5.1.ebuild
+++ b/dev-java/jruby/jruby-1.6.5.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/dev-java/jruby/jruby-1.6.5.1.ebuild,v 1.4 2012/06/25 07:43:03 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild,v 1.5 2014/05/03 21:31:48 tomwij Exp $
 
 EAPI="4"
 JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/jruby/jruby-1.7.12.ebuild b/dev-java/jruby/jruby-1.7.12.ebuild
new file mode 100644
index 000000000000..0df28319a703
--- /dev/null
+++ b/dev-java/jruby/jruby-1.7.12.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.7.12.ebuild,v 1.1 2014/05/03 21:31:48 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java-based Ruby interpreter implementation"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz
+	http://dev.gentoo.org/~tomwij/files/dist/${P}-mvn-ant-ant.patch"
+
+LICENSE="|| ( EPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+RUBY_VERSION=1.9
+RUBY_REVISION=0
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/asm:4
+	dev-java/bsf:2.3
+	>=dev-java/bytelist-1.0.8:0
+	dev-java/headius-options:0
+	dev-java/invokebinder:0
+	dev-java/jcodings:1
+	dev-java/jffi:1.2
+	dev-java/jnr-constants:0
+	dev-java/jnr-enxio:0
+	dev-java/jnr-ffi:0.7
+	>=dev-java/jnr-netdb-1.0:0
+	dev-java/jnr-posix:2.4
+	dev-java/jnr-unixsocket:0
+	dev-java/joda-time:0
+	dev-java/joni:2.1
+	dev-java/nailgun:0
+	dev-java/osgi-core-api:0
+	dev-lang/ruby:${RUBY_VERSION}
+	>=dev-java/snakeyaml-1.9:0
+	dev-java/jzlib:1.1
+"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/ant-trax:0
+		dev-java/commons-logging:0
+		dev-java/junit:4
+		dev-java/xalan:0
+		java-virtuals/jdk-with-com-sun:0
+	)
+"
+
+RUBY_HOME=/usr/share/${PN}/lib/ruby
+SITE_RUBY=${RUBY_HOME}/site_ruby
+GEMS=${RUBY_HOME}/gems
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+
+EANT_GENTOO_CLASSPATH="ant-core asm-4 bsf-2.3 bytelist headius-options \
+invokebinder jcodings-1 jffi-1.2 jnr-constants jnr-enxio jnr-ffi-0.7 jnr-netdb \
+jnr-posix-2.4 jnr-unixsocket joda-time joni-2.1 nailgun osgi-core-api snakeyaml \
+jzlib-1.1"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} ant-junit4 ant-trax \
+commons-logging junit-4 xalan jdk-with-com-sun"
+
+EANT_BUILD_TARGET="package"
+
+pkg_setup() {
+	export RUBYOPT=""
+	java-pkg-2_pkg_setup
+
+	local fail
+	for directory in "${GEMS}" "${SITE_RUBY}"; do
+		if [[ -L ${directory} ]]; then
+			eerror "${directory} is a symlink. Please do the following to resolve the situation:"
+			echo 'emerge -an app-portage/gentoolkit'
+			echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > /tmp/jruby.fix'
+			echo 'emerge -1C $(< /tmp/jruby.fix)'
+			echo "rm ${directory}"
+			echo 'emerge -1 $(< /tmp/jruby.fix)'
+
+			eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
+			fail="true"
+		fi
+	done
+
+	if [[ -n ${fail} ]]; then
+		die "Please address the above errors, then run emerge --resume"
+	fi
+}
+
+java_prepare() {
+	einfo "Cleaning up bash launcher ..."
+	epatch "${FILESDIR}"/${P}-bash-launcher.patch
+
+	# When you capture a new patch, and it misses org.jruby.runtime.Constants;
+	# add maven.build.resourceDir.1 as a pathelement to the javac task of the
+	# compilation target. Also add jruby-core-GENTOO_JRUY_VER in ext classpaths.
+	# Also reorder the root maven-build.xml such that core compiles before ext.
+	einfo "Patching build.xml ..."
+	epatch "${DISTDIR}"/${P}-mvn-ant-ant.patch
+	find . -name '*build.xml' -exec \
+		sed -i "s/jruby-core-GENTOO_JRUY_VER/jruby-core-${PV}/" {} \;
+
+	einfo "Removing classes and jars ..."
+	find . -name "*.class" -or -name "*.jar" -print -delete
+
+	einfo "Fixing up properties ..."
+	JRUBY_CONSTANTS="core/src/main/resources/org/jruby/runtime/Constants.java"
+	for repvar in $(grep "@.*@\".*;" ${JRUBY_CONSTANTS} | sed 's:.*@\(.*\)@.*:\1:') ; do
+		VAR=$(grep "<${repvar}>" pom.xml | sed 's/.*>\(.*\)<\/.*/\1/')
+		sed -i "s/@${repvar}@/${VAR}/" \
+			${JRUBY_CONSTANTS} || die
+	done
+	sed -i "s/String VERSION = \".*\"/String VERSION = \"${PV}\"/" \
+		${JRUBY_CONSTANTS} || die
+
+	einfo "Setting Ruby version to use ..."
+	sed -i -e "s/String jruby_revision = \"\"/String jruby_revision = \"${RUBY_REVISION}\"/" \
+		-e "s/String jruby_default_ruby_version = \"\"/String jruby_default_ruby_version = \"${RUBY_VERSION}\"/" \
+		${JRUBY_CONSTANTS} || die
+}
+
+# Java based tests return propertly, I guess that is because there are none;
+# I've found an executable that can you can run, but it bails out about libyaml.
+#
+#  $ bin/testrb test
+# /usr/share/jruby/lib/ruby/1.9/yaml/store.rb:1:in `require':
+# It seems your ruby installation is missing psych (for YAML output).
+# To eliminate this warning, please install libyaml and reinstall your ruby.
+# JRuby 1.9 mode only supports the `psych` YAML engine; ignoring `syck`
+# NoMethodError: undefined method `to_yaml' for {}:Hash
+#        Store at /usr/share/jruby/lib/ruby/1.9/yaml/store.rb:78
+#        ...
+RESTRICT="${RESTRICT} test"
+
+src_test() {
+	export RUBYOPT=""
+
+	mv maven-build.xml build.xml || die
+
+	java-pkg-2_src_test
+
+	bin/testrb test || die ""
+}
+
+src_install() {
+	java-pkg_newjar core/target/${PN}-core-${PV}.jar
+	dodoc README.md docs/{*.txt,README.*} || die
+
+	use doc && java-pkg_dojavadoc core/target/site/apidocs
+	use source && java-pkg_dosrc core/src/main/java/org
+
+	newbin bin/jruby.bash jruby
+	dobin bin/j{irb{,_swing},rubyc}
+
+	insinto "${RUBY_HOME}"
+	doins -r "${S}"/lib/ruby/{1.8,1.9,2.0,shared}
+
+	# Remove all the references to RubyGems as we're just going to
+	# install it through dev-ruby/rubygems.
+	find "${ED}${RUBY_HOME}" -type f \
+		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
+		-delete || die
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "Make sure RUBYOPT is unset in the environment when using JRuby:"
+	ewarn ""
+	ewarn "    export RUBYOPT=\"\""
+	ewarn ""
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ca99e6477b6c..d7e3ef691c50 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,9 +1,12 @@
 DIST php-5.3.28.tar.bz2 11051714 SHA256 0cac960c651c4fbb3d21cf2f2b279a06e21948fb35a0d1439b97296cac1d8513 SHA512 84b58379ca12748ae2c9ba37de28c80e78bf8e5b96cf9715b1eafd297a3e155089e9560d6fee7b031be0139dcbe954a9c0717b583ff1fb1cd8a89308b5f6dfd3 WHIRLPOOL 6912417784ae11bc3a9134378b5db5d0ee96cdee11e78929162f61f2104870a1d67b559fc3ff3513200a37a1cae0e83e88f1ba0fb5c07f9fb11844e935101dbf
 DIST php-5.4.26.tar.bz2 12270535 SHA256 5053649317b9331df40bd836c976a32b31dbc5c5d68997d3ae01cb90db22d240 SHA512 9ff29943bfe283fc5b925a2d463a4bc6e4bd070909f202ce6e3a45a7281720b550d5569c5ee8e60412342739833d237974442182c392cfa1b2e9d73375f897ef WHIRLPOOL 83095a3ee4e2509c4e03e4ad1a658fe4d98e747193450227656a39368a9127ea56cf876b40384ff64327c19dc5107c99db75742acb14c34cf24adf921b56d598
 DIST php-5.4.27.tar.bz2 12272737 SHA256 09dcc44cded735e1cf1b1b9f2749d1a0fd90e03378b6a70364a662f4740e61e2 SHA512 a3b395d019b801b7280a4ee2816273fe7a3a3f4fc04c73464e93e12a78dfe6e6fd0c0b0ae4f04cc2620a8eb009f018f356f52f1aaf845e9da104084e99ebcd98 WHIRLPOOL 0da13758b9e8ca6a9c9f3f8f74315afcd827be3316383f2b61a451ef0c45c762acdc93961bd9483cd4297e0974fcb577fbda92eee02216dc3ce298ef4a70a77b
+DIST php-5.4.28.tar.bz2 12266216 SHA256 3fe780e5179e90c4d37276e79acc0d0692f1bc0911985af694b92c664c0ef3c4 SHA512 6d2bfc8fff353b44c9b283b37ff23eecb0825f616953751bc78f6c32666884115a64c0bfdcf561de8504d9057b70e0a7b52f5c12f906a3acd709010b1d347b3c WHIRLPOOL 75c01b29839125efded00d3eac9d801ad50b6edc732e081ff4fb5046c013c8027350bd9db14a8b951ad51ba4632ff4dfce50a4a6c604b061b7c8c8d85e9429f6
 DIST php-5.5.10.tar.bz2 13102742 SHA256 bb34e61f8e6f56c612867bfe85d144d5045cd5e44497539bc126a4e8c6795419 SHA512 75d4a5b72c6a467030fe670af9ce162916c3bbd527499c8af08de38fde5d8ea6132de3a4f4ff685e8e0bd38b74acc763efe5accb0a7af222d1e33a46974866a6 WHIRLPOOL 26a44a881bcb3887383e7006eaf41c9364e23ae4727a7ad764dd3ca765d5bcb286c61831dfd7c62ab01250844401cc078bb1270183bf6da9f74178b5c55cad64
 DIST php-5.5.11.tar.bz2 13207627 SHA256 60e14c255f2a461a7a26639b84a2fc448cc2f91c8dead0e9fd00cd8ba27a2e96 SHA512 4fd93b22bb3bdaa1b5f5d53fab33896720434cc15e786109dc5a7503da9409efeb810f63e89a21049b28df938b7592d57bdaae603ce5509fdd963f513781a35d WHIRLPOOL d4d8381f3443e55971ed16647370fa9b14ad6a0715579fcc627a43de85097ed3c4af0cfa7fb1b4d9324eb941f270962759b8e4b3c4f7abfe5819b9023e879c21
+DIST php-5.5.12.tar.bz2 13251734 SHA256 519ee29e28532782676f3d8e31a808ffbfee383e0279ccc8cbd2b12ed53c2335 SHA512 aa576b2a89503c741c90ae69751be094856775b00e8337f6ca95befda85fa300011ce7a3833e01cde11017a1f3107fd6d6f1b9ee2fbb52a2af8ff166247685c9 WHIRLPOOL d2a3440e4ae5ea9e535bdd1d5795a3e0c00cb585878cceee4274706c66b623dc22102f2b4053f0180f28e2806dc57db910aeecb0398f43c5cd9d14f6130045ab
 DIST php-5.6.0alpha1.tar.bz2 12989378 SHA256 17123fd1b07aa1cd16eedc9ae653dfbd560e2b7da95961f546334fda14bba804 SHA512 3cfa54c724f41790d2bbef5d9f5552ec17d6d5fdc75356ba41f747e161d5112ce46fc32f7300897227b61a959f6973558f8d67c7eb669d866569c44ad7507140 WHIRLPOOL f3fcfae2782e6de86e84913c2daaeefc03dd39796143c8001753b9e1dbd923c4f28f39beb81c05cca71d0642db283102f1dee3b4788791d6f478010335595a3e
 DIST php-5.6.0beta1.tar.bz2 13358124 SHA256 85e101acdfa15da3cce63a9d18bbaa92c2f1507246305bd20baf1e5824596d7f SHA512 bc013d2dd6a356519368f9d8486b74660224689a017251df88de849f79f1fbe4ff0d3b4324581bbf37894668359a4131304adf6bc4fb8fa1a5301318c1461239 WHIRLPOOL cf97ee5b2fc744aee8f0458ac271e1a92df73c7e0c165a53017bfebbaf2802ef542929aa3dc63ee880d43c9381a62b26cb34585ff6c842a6e6ccabacd62c3b8a
+DIST php-5.6.0beta2.tar.bz2 13482736 SHA256 ea5b1f27fdf281977e73ec007f1e88a3197a2673ef624d736fd259de69cc23bd SHA512 7796f5d30110a5aaf575e0a7bf211cd5a2bd9afd634d7657b39173b55f587862027620cf4c1f82da12bb01f5e0c4fec8594a8f1555bf197610fad533e0a8ccd6 WHIRLPOOL 4e1e9a2cfd6a2ea766ffdd4322ed1ffe427ab97bbcd516804b852fa03ea6bebccee52bf84bd3e148867555bccb861a0b8aef3fb80a81d4b9be409103143b692c
 DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
diff --git a/dev-lang/php/php-5.4.28.ebuild b/dev-lang/php/php-5.4.28.ebuild
new file mode 100644
index 000000000000..4992d04c00fb
--- /dev/null
+++ b/dev-lang/php/php-5.4.28.ebuild
@@ -0,0 +1,801 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.28.ebuild,v 1.1 2014/05/03 13:37:29 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.5.12.ebuild b/dev-lang/php/php-5.5.12.ebuild
new file mode 100644
index 000000000000..71430c21c371
--- /dev/null
+++ b/dev-lang/php/php-5.5.12.ebuild
@@ -0,0 +1,780 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.12.ebuild,v 1.1 2014/05/03 13:37:29 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.6.0_beta2.ebuild b/dev-lang/php/php-5.6.0_beta2.ebuild
new file mode 100644
index 000000000000..1643a1c731e6
--- /dev/null
+++ b/dev-lang/php/php-5.6.0_beta2.ebuild
@@ -0,0 +1,780 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.0_beta2.ebuild,v 1.1 2014/05/03 13:37:29 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/tyrael/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-libs/e_dbus/e_dbus-1.7.10.ebuild b/dev-libs/e_dbus/e_dbus-1.7.10.ebuild
index a858599ab809..621b133d3f5f 100644
--- a/dev-libs/e_dbus/e_dbus-1.7.10.ebuild
+++ b/dev-libs/e_dbus/e_dbus-1.7.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-libs/e_dbus/e_dbus-1.7.10.ebuild,v 1.3 2014/04/21 08:13:39 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/e_dbus/e_dbus-1.7.10.ebuild,v 1.4 2014/05/04 08:30:03 ago Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Enlightenment's (Ecore) integration to DBus"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="bluetooth +connman +libnotify ofono static-libs test-binaries +udev"
 
 RDEPEND=">=dev-libs/efl-1.8.4
diff --git a/dev-libs/efl/efl-1.8.5.ebuild b/dev-libs/efl/efl-1.8.5.ebuild
index cfda49ecb88f..3b0b414b0ced 100644
--- a/dev-libs/efl/efl-1.8.5.ebuild
+++ b/dev-libs/efl/efl-1.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-libs/efl/efl-1.8.5.ebuild,v 1.6 2014/04/21 08:13:08 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.7 2014/05/04 08:30:07 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ inherit enlightenment
 DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 IUSE="audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm"
 
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 629d7752865d..71f161d1a110 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1 +1,2 @@
 DIST fribidi-0.19.5.tar.bz2 625034 SHA256 501231e4260f83fccedae1cafe983a7de87082e3f5387e0b283d016f7f4cb428 SHA512 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43 WHIRLPOOL 5241696a5477f9cd1931213b14a27a21647ccabbaaaa0d2f8112a51efeeb7557b3b614bbb30500cd1ebf17fd4332007c22c42c1667e738dc2a2e94e1c182211a
+DIST fribidi-0.19.6.tar.bz2 639022 SHA256 cba8b7423c817e5adf50d28ec9079d14eafcec9127b9e8c8f1960c5ad585e17d SHA512 0661cf8e0985edfd5bf02c8de32432bf2faacadcaf35aef4e039a28f802a0468288e76b60231ebe7b54f909bd4d3ecc31a1fc94e83d434ae16dd21de6089629e WHIRLPOOL 71a1d1b44a4d58e6e4567f21a7e9f72a925f648a817d1c59d3815c8070e48656889c91afe2c842ca56e2bd8f33c783a4bbf16864514106614a12b8394c03e674
diff --git a/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch b/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch
new file mode 100644
index 000000000000..c2b39155eea2
--- /dev/null
+++ b/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch
@@ -0,0 +1,20 @@
+diff -ur fribidi-0.19.6.old/lib/common.h fribidi-0.19.6/lib/common.h
+--- fribidi-0.19.6.old/lib/common.h	2012-12-30 00:12:59.000000000 +0000
++++ fribidi-0.19.6/lib/common.h	2014-05-03 11:04:19.969727962 +0100
+@@ -130,14 +130,8 @@
+ /* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being
+  * allocated for data structure pools. */
+ #ifndef FRIBIDI_CHUNK_SIZE
+-# if HAVE_ASM_PAGE_H
+-#  ifndef __FRIBIDI_DOC
+-#   include <asm/page.h>
+-#  endif /* __FRIBIDI_DOC */
+-#  define FRIBIDI_CHUNK_SIZE (PAGE_SIZE - 16)
+-# else /* !HAVE_ASM_PAGE_H */
+-#  define FRIBIDI_CHUNK_SIZE (4096 - 16)
+-# endif	/* !HAVE_ASM_PAGE_H */
++# include <unistd.h>
++# define FRIBIDI_CHUNK_SIZE (sysconf(_SC_PAGESIZE) - 16)
+ #else /* FRIBIDI_CHUNK_SIZE */
+ # if FRIBIDI_CHUNK_SIZE < 256
+ #  error FRIBIDI_CHUNK_SIZE now should define the size of a chunk in bytes.
diff --git a/dev-libs/fribidi/fribidi-0.19.6.ebuild b/dev-libs/fribidi/fribidi-0.19.6.ebuild
new file mode 100644
index 000000000000..394f90476022
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-0.19.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.6.ebuild,v 1.1 2014/05/03 10:11:56 thev00d00 Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools eutils autotools-multilib
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="http://fribidi.org/"
+SRC_URI="http://fribidi.org/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RESTRICT="test" #397347
+
+RDEPEND=">=dev-libs/glib-2:2[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.19.2-nodoc.patch \
+		"${FILESDIR}"/${P}-page-size-header.patch
+
+	# Fix compability with dev-libs/glib >= 2.31
+	sed -i \
+		-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
+		-e '/include/s:<glib/gmem.h>:<glib.h>:' \
+		charset/fribidi-char-sets.c lib/mem.h || die
+
+	autotools-multilib_src_prepare
+}
+
+src_configure() {
+	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
+	# present in /usr/lib/pkgconfig/fribidi.pc
+	local myeconfargs=( --with-glib=yes )
+	autotools-multilib_src_configure
+}
diff --git a/dev-libs/gmp/gmp-5.1.3-r1.ebuild b/dev-libs/gmp/gmp-5.1.3-r1.ebuild
index 4442a15d9f89..a40fb5ff8a02 100644
--- a/dev-libs/gmp/gmp-5.1.3-r1.ebuild
+++ b/dev-libs/gmp/gmp-5.1.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-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.15 2014/04/20 11:20:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.16 2014/05/04 08:30:24 ago Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/granite/granite-0.2.3.1.ebuild b/dev-libs/granite/granite-0.2.3.1.ebuild
index 30b76ff35773..a65cf4da164e 100644
--- a/dev-libs/granite/granite-0.2.3.1.ebuild
+++ b/dev-libs/granite/granite-0.2.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/dev-libs/granite/granite-0.2.3.1.ebuild,v 1.1 2014/04/07 15:31:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/granite/granite-0.2.3.1.ebuild,v 1.2 2014/05/03 14:11:22 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+do
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.32
diff --git a/dev-libs/libcdio/libcdio-0.92.ebuild b/dev-libs/libcdio/libcdio-0.92.ebuild
index b9d597ff73f2..6ff46a438387 100644
--- a/dev-libs/libcdio/libcdio-0.92.ebuild
+++ b/dev-libs/libcdio/libcdio-0.92.ebuild
@@ -1,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/libcdio/libcdio-0.92.ebuild,v 1.6 2014/04/23 20:00:15 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.92.ebuild,v 1.7 2014/05/04 08:31:34 ago Exp $
 
 EAPI=5
 inherit eutils libtool multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/15" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/liblogging/Manifest b/dev-libs/liblogging/Manifest
index 371010a4a576..afc7c23bdbfb 100644
--- a/dev-libs/liblogging/Manifest
+++ b/dev-libs/liblogging/Manifest
@@ -1 +1,2 @@
 DIST liblogging-1.0.2.tar.gz 285555 SHA256 bcadd9fc0253ee096df965d8d46bc3f27a95f4885d66e55e495e5dfddb16b0dd SHA512 bd2a78110f080e0531388bac372e5dac2c7f10973e59bc3c702d3c9ae3a5d21ae021df00b53092fabcbbde20f1eba108b22ea81156c2fcb6bc2053531385b9f9 WHIRLPOOL da2a6963e93527ea0d30fbffb5d9971cd62b36871d488a88b500848a7920b0416415480e2002529f7fa51d730f0f5a30946a34af4628eefb69dcc82349620731
+DIST liblogging-1.0.4.tar.gz 565078 SHA256 aceb5d2aa8bdc771ff66f407f9adf4176b654db63e34a8605795b68be537b81c SHA512 7d57a4d5d41ab2033dd57370c4511749f7965949a30eacaf36e7608acc64a32c42903dc1b5bb50c649dcb9a5ed91a2f0339d21aa0fc20a6a6144616dae556ccf WHIRLPOOL 76f9ba9ed7b8b7a050a29ca1be8e723c0b99f774416dd514b74b792bafafadd677533f38d77577b75ec6267b1025810a5262b763223c55a983efbf39a3f19085
diff --git a/dev-libs/liblogging/liblogging-1.0.4.ebuild b/dev-libs/liblogging/liblogging-1.0.4.ebuild
new file mode 100644
index 000000000000..db9549406f15
--- /dev/null
+++ b/dev-libs/liblogging/liblogging-1.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblogging/liblogging-1.0.4.ebuild,v 1.1 2014/05/04 14:08:27 ultrabug Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Liblogging is an easy to use, portable, open source library for system logging."
+HOMEPAGE="http://www.liblogging.org"
+SRC_URI="http://download.rsyslog.com/liblogging/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="rfc3195 static-libs +stdlog systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable rfc3195)
+		$(use_enable stdlog)
+		$(use_enable systemd journal)
+	)
+	autotools-utils_src_configure
+}
diff --git a/dev-libs/libmateweather/libmateweather-1.6.2.ebuild b/dev-libs/libmateweather/libmateweather-1.6.2.ebuild
index cd89a3546df9..37152051dd0c 100644
--- a/dev-libs/libmateweather/libmateweather-1.6.2.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.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-libs/libmateweather/libmateweather-1.6.2.ebuild,v 1.4 2014/03/10 23:02:10 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmateweather/libmateweather-1.6.2.ebuild,v 1.5 2014/05/04 14:53:15 ago Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="python"
 
diff --git a/dev-libs/libnl/libnl-3.2.24.ebuild b/dev-libs/libnl/libnl-3.2.24.ebuild
index 1d7d83069778..172f945ef064 100644
--- a/dev-libs/libnl/libnl-3.2.24.ebuild
+++ b/dev-libs/libnl/libnl-3.2.24.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/libnl/libnl-3.2.24.ebuild,v 1.2 2014/04/06 14:56:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.24.ebuild,v 1.3 2014/05/03 21:00:22 floppym Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
+PYTHON_COMPAT=( python2_{6,7} python3_{2,3,4} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 eutils libtool multilib
 
diff --git a/dev-libs/libnl/libnl-3.2.9999.ebuild b/dev-libs/libnl/libnl-3.2.9999.ebuild
index 6bdd648cb5f0..234a0a75b12a 100644
--- a/dev-libs/libnl/libnl-3.2.9999.ebuild
+++ b/dev-libs/libnl/libnl-3.2.9999.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/libnl/libnl-3.2.9999.ebuild,v 1.4 2014/01/29 15:43:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild,v 1.5 2014/05/03 21:00:23 floppym Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
+PYTHON_COMPAT=( python2_{6,7} python3_{2,3,4} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1 eutils git-r3 libtool multilib
 
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 6c7604956993..298aaef856fb 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -4,3 +4,4 @@ DIST librelp-1.0.0.tar.gz 384203 SHA256 a4b28e72a003f4a2a7fcb7c6093d60af6d252f17
 DIST librelp-1.0.1.tar.gz 355401 SHA256 76b010aa9149976802daa2e5fda7ac02a8a227b0c8c0d1069eec2d2a6629739a SHA512 8a8e5e7b4d6f9b0741f378188080a633c03082990ee2b73131ad41275200ceb8c72a8338cec1e65e7ecc6c196df351206174aa29654a162f9515075a384262d1 WHIRLPOOL 938aadf2285dae7f11b494133711a118092df7409364bbcdabf04087580de843a6a61b83b24db36281990f4261833d4c9570617dbcf3fdddf7f7d7263a208fb7
 DIST librelp-1.1.5.tar.gz 401409 SHA256 2322d771bd6036dd11519509177722baa36bc0e61a5d6748cbce0addf7f43243 SHA512 f0b33e6fe332959b359f8044b35b268d283ccdba2690dd7c44f2ceade3ff38073e0624366e17a2dd3fd1df3b5d78e319958f3aff681f9d791202a458a4bdc408 WHIRLPOOL cfa7f9b3013e47b24caf7cd91da17648a86d5c33e43d87c5fc7e69b06c34938b82f4f4fafbb5a717528d9b9990667c4fedc8f3b83c5e3ba65cd000f696587193
 DIST librelp-1.2.0.tar.gz 406527 SHA256 5a8870fd2ae496be08d100ef8a65807311f11d6976ed37b8e0cd8024872c31e5 SHA512 07f63a3ccdef6da6f732cce5c0e10e1d738bda76fe9df797b761a04c00ba02645e03e6e87cf97a04dcf7109978cf86dcdba08f4988d7db7a4de4c29c87873e8a WHIRLPOOL 8440cddc0f401660005724a318f75eff242d7644c98e105c016fa040369a3163ba2894d7c0eaf54a1e285c9cada5215d67e5beb9e85fa0894fbf1c971a76560b
+DIST librelp-1.2.7.tar.gz 410896 SHA256 3a434a1c71772706104cfb1c93ba8e6809d257851d60de29ac2142c60c68d7d1 SHA512 f8a71ad037cb5eaeb807b1bcb942893e2d10bcd57b18764bb13700c8e114d59de37b1b36560288abac18a07b6cb2920b46feaef4ae629aa0b3478ed16723542a WHIRLPOOL 784f291d0318b29be33bcd4bdd41e04c2e0fc8f292c6cb7f5985743559aa65f3c10932680f943e065ebf34e3f62c75bf2ed5500aebe0b7ab2fa7e64ced37cc44
diff --git a/dev-libs/librelp/librelp-1.2.7.ebuild b/dev-libs/librelp/librelp-1.2.7.ebuild
new file mode 100644
index 000000000000..e3faa1b125d9
--- /dev/null
+++ b/dev-libs/librelp/librelp-1.2.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librelp/librelp-1.2.7.ebuild,v 1.1 2014/05/04 14:17:14 ultrabug Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An easy to use library for the RELP protocol."
+HOMEPAGE="http://www.librelp.com/"
+SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 doc? ( FDL-1.3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
+IUSE="debug doc +ssl static-libs"
+
+RDEPEND="
+	ssl? ( >=net-libs/gnutls-2.12.23-r1 )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable ssl tls)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# We don't need the *.la files - do we?
+	find "${ED}"/usr/ -name '*.la' -delete
+
+	if use doc; then
+		dohtml doc/relp.html
+	fi
+}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.2.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.2.ebuild
index 091094be3d52..e2102a9c9f6a 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.2.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.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-libs/totem-pl-parser/totem-pl-parser-3.10.2.ebuild,v 1.1 2014/03/29 21:20:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.10.2.ebuild,v 1.3 2014/05/04 12:09:53 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://developer.gnome.org/totem-pl-parser/stable/"
 LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt +introspection +quvi test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/dev-perl/Roman/Roman-1.230.0.ebuild b/dev-perl/Roman/Roman-1.230.0.ebuild
index 0617e9768be9..40dd7ef0d91f 100644
--- a/dev-perl/Roman/Roman-1.230.0.ebuild
+++ b/dev-perl/Roman/Roman-1.230.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/Roman/Roman-1.230.0.ebuild,v 1.5 2013/12/16 20:22:39 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Roman/Roman-1.230.0.ebuild,v 1.6 2014/05/03 18:48:41 zlogene Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ inherit perl-module
 DESCRIPTION="Perl module for conversion between Roman and Arabic numerals"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~mips ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-php/PEAR-Text_Figlet/Manifest b/dev-php/PEAR-Text_Figlet/Manifest
index 3d44dbe40140..988b6738e45f 100644
--- a/dev-php/PEAR-Text_Figlet/Manifest
+++ b/dev-php/PEAR-Text_Figlet/Manifest
@@ -1,3 +1 @@
-DIST Text_Figlet-1.0.0.tgz 23592 SHA256 b4d20af0735c458d0dffaa5f13236e638bffbfea901e7284456ed121b52a3eef SHA512 3362825d48fce5252def802d1cc34e00e3d7aa1ad18427b803c981d47a2b11fc0b3e3c474b78757e5b8a7ec91589233d5bd7ca5a54126ecef379966167684658 WHIRLPOOL b6ea0636efd335e60a006a3e578b3f17cad4ee3d50f5665274dbe69d4178ede72a2c40be72c34b9f1d6cc479a07bde8a9f152575e5ca5664e028b3a9028af3ab
-DIST Text_Figlet-1.0.1.tgz 23508 SHA256 9cc396c72a05b8bf24d8ee9290e97138fd145d32fd6f10b6e1fe212f5a58c77d SHA512 de5e5685a74993f34d3daca214a32926666c8c3336bb2900b0e3c200d4da3d6a5a8084b528d0040430b606412f1448a337db5863911fcce00b9de67a2c7f9146 WHIRLPOOL e7f68387548dbc7c6631f87a6fdb4078b402defa0a8815ae52b5568198b506079ff80f22148487c6e9e00b1084a48949118b9cce17d4965f747c745dce339db6
 DIST Text_Figlet-1.0.2.tgz 8775 SHA256 fca154099d96a4a1d14fc9581af0a01c6b067a23bc69598834faa1100252a883 SHA512 e17578a2f4ebd67adedc57cbeceb8191a7ddc712efe0a631cb696d79392bc025ecdd0b389078dc65f6e0fd676d3e435178ae280cae9b9c11d8c4964152d9db06 WHIRLPOOL 43ccf9708790cc5b0f07fee31be664563d245679ac5e90dfde93f5d48e99b97626db1c81c80e7adf1a93664fc01ec7b644b974f9e538c9a708dd3a7f36d41e5a
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.0.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.0.ebuild
deleted file mode 100644
index db8fbe92a544..000000000000
--- a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.0.ebuild,v 1.2 2007/12/06 00:54:38 jokey Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="Render text using FIGlet fonts."
-# the bundled fonts come from figlet and their license is not really clear.
-LICENSE="PHP-2.02 as-is"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.1.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.1.ebuild
deleted file mode 100644
index 5d5de3d3517a..000000000000
--- a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.1.ebuild,v 1.3 2010/08/12 08:47:59 maekke Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="Render text using FIGlet fonts."
-# the bundled fonts come from figlet and their license is not really clear.
-LICENSE="PHP-2.02 as-is"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild
index 17dce8c6fea5..0f50ac7a5c84 100644
--- a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild
+++ b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-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/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild,v 1.3 2014/04/25 11:17:53 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild,v 1.4 2014/05/04 08:29:12 ago Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Render text using FIGlet fonts."
 
 LICENSE="PHP-2.02 GPL-2+ OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 8ca80f8b1acf..92a236b6e95f 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,3 +1,4 @@
 DIST APCu-4.0.0.tgz 104250 SHA256 1e1a3c1f06c57fac02787f3a581105efe8d8b9c27b8bafd25fb303813449f60b SHA512 ad5d90d68e68f8f15e0d8d8823b77217c6b095a21e921b40fd8c00dbc5627db48425827495a7c1e891b7d59488fa32e7e1bec6634057c531f4ea70749620d5f2 WHIRLPOOL 59cc9bfcb7c11c3bcd673520100dfb35d1cc4276e875c4905b3074260d7418690d4b7f9df71ad729e8d78d19056d22091e90aba9667036b13780ee797a1c7972
 DIST APCu-4.0.1.tgz 105861 SHA256 d9d22fdb69a43118da2bd8c120bfc34da7dff89b9327beb52ded4d1aa73e266f SHA512 64d92ee59b3e404514420c48cbe73e2ae41d3b3cd97a68724b29dc00302dbee8ea465211f52fbc5e116c6a3afb3b4eb69b07eeaef5b038294debb5a541fa9415 WHIRLPOOL ce7725e7f5fd268a6f17b51a3610b50a7d96fc6a0bc72d9f1b80445ec586cac433cb42ee1f5ca4336b321bd69b0886bcf8b4f83a6a51d0355045552bea5a180b
 DIST APCu-4.0.2.tgz 120325 SHA256 83fdcc0505522414e4785c86e62e20fe3643ff4790c035f86de35fc7339021aa SHA512 b9faa0f6a9010d3a5546cbafddc5bed7b58a06ad5c3a7fd2c90a0f69c5bdd1861e644372a1083750b6d5a472dcd707ced2b56351a97113e35678d9d55f750ee5 WHIRLPOOL 510fce9611d0e38040fb95cfddf0437ed3a487558edbe8b7afad304d63e07e714786187ef678ec12fcb7d26a9f78259d9ddf31c4c260b3952ff8404bec3b395d
+DIST APCu-4.0.4.tgz 119708 SHA256 f97cefb1bf9670d88c98e8c5e78d378927ab52a88b7147361a63401631b5ad3e SHA512 674dc0388dab0d366fa57acf1ef90bc86ad96e853d78e810e12d96eb3c5b9c508bd830af0f2aef1e5d96eca56960e962462015fe5c818ea4763a68ea418632e3 WHIRLPOOL c558771c7a3a50ac88a444003a5b8606d3118304056396b5797670895f78680a069e74ec07d370d569f9a64694bf20f978e0d15fb2a9e92a78a3199ebc66f424
diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.4.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.4.ebuild
new file mode 100644
index 000000000000..9f9b3d350b8e
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-4.0.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apcu/pecl-apcu-4.0.4.ebuild,v 1.1 2014/05/03 13:52:04 olemarkus Exp $
+
+EAPI=5
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_PECL_PKG="APCu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
+
+USE_PHP="php5-5 php5-3 php5-4"
+
+S="${WORKDIR}/apcu-${PV}"
+PHP_EXT_S="${WORKDIR}/apcu-${PV}"
+
+inherit php-ext-pecl-r2 confutils eutils
+
+S="${WORKDIR}/apcu-${PV}"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache."
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_configure() {
+	my_conf="--enable-apcu"
+	use mmap || my_conf+=" --disable-apcu-mmap"
+
+	enable_extension_enable "apcu-rwlocks" "lock_pthreadrw" 0
+
+	php-ext-source-r2_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r2_src_install
+
+	dodir "${PHP_EXT_SHARED_DIR}"
+	insinto "${PHP_EXT_SHARED_DIR}"
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of pecl-apcu was"
+	elog "installed into ${PHP_EXT_SHARED_DIR}/."
+}
diff --git a/dev-php/pecl-mongo/Manifest b/dev-php/pecl-mongo/Manifest
index 790885bef5c0..43a9447a9200 100644
--- a/dev-php/pecl-mongo/Manifest
+++ b/dev-php/pecl-mongo/Manifest
@@ -1,2 +1,3 @@
 DIST mongo-1.4.3.tgz 140481 SHA256 43686e8c9fabfec6852fa42eb664aa662a6d423b4bd3eba41f42514892d8d4a4 SHA512 a3f7d931983f36b3154e813fa71d66ec341d97932a9300a938d971642d8ceef8fdc47fdad456a5dbf12748debfb56468b59c5abc952d57c230cc527db636d890 WHIRLPOOL d736f0683575417d535f8757305af291a0309a10816db1f0cc1d9c2c073e26bdcad2126a6eda02b42edff36274a8c888dfad9a7d1503fe05ea7c4f85e2248c7b
 DIST mongo-1.4.4.tgz 141242 SHA256 fb477e447779cff794e3a976232f5741fcc59c9f6798fccd9d0bb1a911fadd71 SHA512 5e94db8faaa05c34829802e8a413f5c8c86acee477a87cb42ccf6882af0b23fbe17419fd3b61eab277c6c0aa3028a784342e6ff70ef977a75bf95097c493ff9e WHIRLPOOL 9f6d2c85a9bcb7cd10cca2cfd950e3c482748b53c5437cc1f5c03ce82f266d236f2a32a38e6027cc356e8be3a557fdf4dfee2d404f540fcdf9505e7c6c850890
+DIST mongo-1.5.1.tgz 188885 SHA256 883aad17c44e8f053b10c8e31d7ff6487d5b5660ea8bd17a7b62976e988c4ea4 SHA512 980f413280766dc3d947f91675e031e0fa4aa980f8b68c0b48388ceaadc1bda773b3126bd4f2cb72399522f4260e9a47338583337a0c48befc22a9228c11357e WHIRLPOOL 4043ac652b04ed7ff45b1855e07eaaeb6a574d92707cb866e60fdfb8285e9343c1fdd7b26fc495deae57b0269dd07f77271699b87c19370c739c126e96215e64
diff --git a/dev-php/pecl-mongo/pecl-mongo-1.5.1.ebuild b/dev-php/pecl-mongo/pecl-mongo-1.5.1.ebuild
new file mode 100644
index 000000000000..a3273f9562d1
--- /dev/null
+++ b/dev-php/pecl-mongo/pecl-mongo-1.5.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mongo/pecl-mongo-1.5.1.ebuild,v 1.1 2014/05/03 13:55:14 olemarkus Exp $
+
+EAPI=5
+
+PHP_EXT_NAME="mongo"
+
+USE_PHP="php5-5 php5-4"
+
+inherit php-ext-pecl-r2
+
+DESCRIPTION="MongoDB database driver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 391791cddae1..3db49b1a2d98 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -2,3 +2,4 @@ DIST xdebug-2.2.0.tgz 247670 SHA256 19c8c03bd2c70a1edfef4ed9a2768af41eec5d678fe2
 DIST xdebug-2.2.1.tgz 248057 SHA256 11d340eb7f87909a596bac054cc927df757dc2fc7c90b50a832c30e9bf84c9ad SHA512 3243041defb7a42b97c05efbaa547fe10a7aa03900d8628ea3f7066d4839e527ca94531c990ebc09d56a4ba101e31f1964248913b6e7f55fab8051a1299eb030 WHIRLPOOL 2b78e35fc599395a0cb2abe9a81106883bc13f2c2e794fc3d548d7965a3f438df0b14a1d8928f44cd9168b3290cf43b3a4e552446afb1dfe1c25ab6e2fe1fd32
 DIST xdebug-2.2.2.tgz 250184 SHA256 b143cb205a2a07ce50fc3c4d1e3c51958837927f97f1d9e912b99015e2c84f03 SHA512 22ace1b2635a9424e201b45252018035ef71d1e018d009eae31e2874c29fdceb8d7f016ee9d6da7bfdb81eec027a7988421d3c5c2088ba9371ceb86f016f7ed5 WHIRLPOOL c1af8e32ea90bc0deaf2463274342fc3cac5acd31e8226cfec1b40558857395ef009cec3da825024560c34a067af0891d5a6f19f52e23ef54792afcbe47e21a1
 DIST xdebug-2.2.3.tgz 250543 SHA256 b351872da46ed8378dff90a87673f5ec1e0bdd94324558ebc898e1d115e9d71c SHA512 2ba62010776a1bf05fbbc9bee086b88ce23d257814e309732e4ec3015079213a7a8cf855256edadd8566d564050a6e517ac9f3c239e3be3af0bfdcb3a79d21bc WHIRLPOOL 66c4da83a91ff6d838a72f2286b5e462e0e45c2ce8083b4826b454292c1d9d895e3b3b928ab7e0cec2cd7cd1a986cb3f13043ee80edb0915d52797f85ab0fc9d
+DIST xdebug-2.2.5.tgz 255840 SHA256 adc6fe92dcff2368be94d20a5997aadb4d46d74551e2dd6602a704a35a195a6f SHA512 19177fef02716beee172f68cb1ef26bdf7f949b06ade2047e7b9131d70b1f8794b8db7c115f2b6114a42d7568c0d4bc6d850a705627db83d5b3020aeee44ac40 WHIRLPOOL 6f6ce56acf0f09f846fd59818d81c1fdcf4e3cb74f234f427b7c7fd985578faeb982b3774bb7748ef6ea0876cea3d5f3d15550bfbe589557c787f4e433a951bd
diff --git a/dev-php/xdebug-client/xdebug-client-2.2.5.ebuild b/dev-php/xdebug-client/xdebug-client-2.2.5.ebuild
new file mode 100644
index 000000000000..5358d3ae98b4
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.2.5.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/dev-php/xdebug-client/xdebug-client-2.2.5.ebuild,v 1.1 2014/05/03 13:58:25 olemarkus Exp $
+
+EAPI=5
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)."
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with libedit)
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
diff --git a/dev-python/authres/authres-0.602.ebuild b/dev-python/authres/authres-0.602.ebuild
index d597a1d969c8..0c73d4298910 100644
--- a/dev-python/authres/authres-0.602.ebuild
+++ b/dev-python/authres/authres-0.602.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-python/authres/authres-0.602.ebuild,v 1.5 2014/03/31 21:02:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.602.ebuild,v 1.6 2014/05/03 04:28:46 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index cfd26e8d9944..73e08b5cd343 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -2,3 +2,4 @@ DIST autopep8-0.5.2.tar.gz 10049 SHA256 a9a808bac49605036bdeaa4bf5b50a9bbf87088a
 DIST autopep8-0.9.5.tar.gz 71000 SHA256 d6610d683d02a1a487cc3f7d8ef6dd8e436c897f97b64ea2dcfc384767429670 SHA512 daef04cf3d2085fd59af3d8603e14e36e8d2673b783055971212438014b74e6732d8309a870285a2a8f8915cffdf27bd63631ddf6dfd1bb07c2e19b92ed32dae WHIRLPOOL 40d5d0b07c88a85075fed6742528f277d0592f88849bc9d1d1816bcc97c0744726570c8af44f0b1ed3b2840b73286496fe969dc7a0b9020a9f9f87d1f771d1e0
 DIST autopep8-0.9.6.tar.gz 69979 SHA256 14d6b1f8c940902256b827c1b3fec3ccb756f116120f52813f6cf5c0c65e1ac8 SHA512 a927ff54be34d0872d037241903240535bba004f6b8314fff8c6ddd2db944d2cbea16554c42ef914d13d3844b223493c5c1a3d050f6ad2febb7339b5a83920bf WHIRLPOOL 9beb90f49ba75afdf8f4569382043a4ea5f08d354c7e2ca7ef337708e19d29f90191b00246380a58d9d03339959d87c8eba2c75a736bbf887f077937b852475e
 DIST autopep8-0.9.7.tar.gz 70989 SHA256 1f447ca48b85f2282a6368c0d12dc9a210460f680ff654fe54556a9ce4e22910 SHA512 15d786ea7c4555fc553ba2e0f6d47eaaa8a92bafd5d3ad81833c5233e4229806653e8c9b9dee8d6841c048c7dece26e6e4141c6185e900591e9185d1ceeeaabf WHIRLPOOL 729a29aa34c39645ce08edab0574f715e9d056550e2b84dac6d4f5bd688bad20cd9b8daa46938310e123c987319ca9886cac5c8091ec683ce1279c041bdf6b79
+DIST autopep8-1.0.1.tar.gz 121030 SHA256 50a30344ddbfeaa72577fd329e8b6411d41e34dba98724147d5240e1c62a4fc2 SHA512 def474a45f067d440ca769e033ac839818e55a2799ebcdef1aff27c441ca7d81b7d634400313b0f08afa06253bcabbdc35360afd641ffe3ebf98eac000972b4e WHIRLPOOL 92f39791680e55af2797cab5089997f5ecf73c66d955e0dff844c930de6154394aa0f81b3091895e4b5f29131d8346d4e2c670013147c41dc52812c4028bdf4c
diff --git a/dev-python/autopep8/autopep8-1.0.1.ebuild b/dev-python/autopep8/autopep8-1.0.1.ebuild
new file mode 100644
index 000000000000..51f912ed9b8c
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.0.1.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-python/autopep8/autopep8-1.0.1.ebuild,v 1.2 2014/05/04 08:47:35 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
+SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pep8-1.5.6[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
+	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
+	ewarn "(indentation checks inside triple-quotes)."
+	ewarn "If you do not want to be affected by this, then add the"
+	ewarn "following lines to your local package.mask:"
+	ewarn "  >=dev-python/pep8-1.3"
+	ewarn "  >=dev-python/autopep8-0.6"
+}
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 00c2a07ed7fc..32d7f66f2536 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1,9 +1,4 @@
-DIST celery-3.0.12.tar.gz 1218262 SHA256 716a465327ded5048893d518eafdade5eb09eb9d941e6efdbdaaac73b0251d3d SHA512 4ce7da636b52b0f87d46444c27ac1c6ba2e6afc1cd3378829e1a01c01f18adf6ed91e64e08ff19a52833071df58dbf6d452ffcfd008a4fe1ce57ccbff0bb0ed6 WHIRLPOOL 5d045eb19394d09b6816d60a745508565d75775b814225939ee9e252b0690cca2b4b73850a970ba98a6c3ad21bede1747d297b7a8e757bb0cb8d366ced275650
-DIST celery-3.0.13.tar.gz 1223019 SHA256 1a8d045c94bfda832db2afbc786e8c99ac0e094d6019a5d89c8adfe04f396d6a SHA512 20bfa638893497f1bbb29859fa0b6f488341aa07d0243da7a713642b9723825de7f747dca09d0f5544dddc7b9595775e947ce247d03204f4080be51d5e3a4955 WHIRLPOOL ac699c0900631138247fccf0de4f13ed8f508e3edb2c5fd01582d36e96ebbdb80bdd9fae00b9c2984f6088cf14cda30114335ebdc1afc5a8da3981a3e541bffe
 DIST celery-3.0.14.tar.gz 1229097 SHA256 57006a6e477282a2e55ace498729bf13218ac2c7ad5d9d920ad86b2469458df2 SHA512 df98a4a5661a005ed295339f527aef15e7d25c625904bb60bf3e305f40136c21ecd30d557cffe71b1888214e28099205df31e56e26d1d698e4b1366c11cbb722 WHIRLPOOL 29e984da6d5120ac31f04e5bf789ed1163d0726351725921d8c776a2fea1dd10e83a64a9979149f3bd2690884908f3963c7caa0374e49ca33fc7098aed8dda57
-DIST celery-3.0.15.tar.gz 1229180 SHA256 c20637d2ad68ddc407f4fba89e3afccbe7a9c55a3b79059579ba9fcf5de5d976 SHA512 697d88797d90cba747d8d331d2bef30427ef2ce574674543c0aec37d22a59c324a64092d1a0218c89ac122178a65488bb9a97e83b2a319272afd2538c2f6985b WHIRLPOOL af92937d660b12f560a18e7ebe94be448773b490e1c76d2bb017c434d95c871f988c6bedad746aa8da94cb6b87e34ca46ef73dbefc8f3af28f7925e4c8f81e44
-DIST celery-3.0.16.tar.gz 1233799 SHA256 31dc01e2e9c52825419d760422de7a6ce6fc789960fa087e8227ff4a528a2120 SHA512 4f483cb98f614868a7199d9621a68a1eaeff55740718b500385b73a0aca1f2ff67970316e3c4e88bba476ce0240adfff1e36703a7698f9c03ebdb989e156a337 WHIRLPOOL 5d6ff8cf7730806643f8c618eece2b014e847b8d3ee1c888f332e5c8dd718bd80f3e78132a379f29e55d274d30af788c640dce8f480c03f7b29a974bbe993c04
-DIST celery-3.0.17.tar.gz 1235117 SHA256 554d1e0c7cd8346aa372bb7f2b971441eee8e192a6a3855c89bad4d33b7bd947 SHA512 b426dc0e06efb4d9bccaaad57368ffedae275f758a5f6325b4aa78646b68620e381389a52d2f84d5d007269089230ac349620a021986e0fafd8acee1a1e55ecc WHIRLPOOL 38e8e412e1a419dcbd9874c9e17a17443bf6377c1b6d98fe76c53020042033edf4696021edaa04baaafe3c3acc3b4fa88c36a414ea3f99cafc74cfe520793563
-DIST celery-3.0.19.tar.gz 1242004 SHA256 70ce2ff1143d964378b3e50817366256a036e78422e85cd89724d5e6ef022e55 SHA512 e6401adeafd1fe5e69a99bf69fe2a1a7ffe033d24fdec2732d5f564c7026cda78ca5fa1a8dfd3cebc9d4879e15e77b5b54018c4b6ba9f65db92d44ed99dcb178 WHIRLPOOL f47d5cdfb56e9695aff470d7966a920d95e03ce19a0af4e56cfb7d88e47b9cb78f4a8ae41efa789cb0de4e1675d8b1098dfb52adceadea4eaeb24efd6281ce83
 DIST celery-3.0.21.tar.gz 1094747 SHA256 c1a76a94ba0d766630678df4912e211dc916f73143a189f8a6e37148ad2ffa53 SHA512 d6ef29a8cfad6016935398d3df7639dd06f5e47159b08550e7a83a80cc2d00da6ef2e284ffc1bde4c7e1d5f1213c83b17097c8d62a39ab390f300a4d4d22f39a WHIRLPOOL 29a4af9dcc99797ccdb8e4db022dd6688ddb1f1656e9fdaa5f06d4b109d2adda305f72a8089a418be0422d117f8edbf3b42e698eaa0633c81c9d4c1ea5719d57
 DIST celery-3.1.10.tar.gz 1287618 SHA256 0c292e17d439db20e10e07dd78ef51ec1d748af78cf247b69ee02bbce4923d36 SHA512 fa818db8a839516f2d54590d3d9e834eb16f7acb2e49373d79cec460af1b4d6a34ea4a2b9ceab8b40d964f608768dccc4a2286ac29f8bc4ec5691b90aa250c23 WHIRLPOOL 0db911c0c593d4a09c621d1e2b9a2b1aaa24884e965bb11c14c3380112e548a2fcc72404f6aaf8374d03b624efdcc0d17dcebb43280a78c5f720b75792f2ebb8
+DIST celery-3.1.11.tar.gz 1289359 SHA256 7614e789a997a540bab589ca763f1006c6881e64479e8a03f72b225c25ff5250 SHA512 74ea4bb08412007b47b070d6a5144ba538ae488ef5a24da19e303a5737ef74bcb7c3e7a98b89869750b318df6ba115368dd0517f394003b1c9a191fe0a861ecf WHIRLPOOL b72b31b4429a7fc0553e52d8054bdeaa1df879279f59a6d47c56811926fca471b0471247aac4f8675aa080faf4e394a9cf701d735cd17d4eca27eca5108577af
diff --git a/dev-python/celery/celery-3.0.12.ebuild b/dev-python/celery/celery-3.0.12.ebuild
deleted file mode 100644
index 5c74b7205a59..000000000000
--- a/dev-python/celery/celery-3.0.12.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.12.ebuild,v 1.5 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-require-python-dateutil-2.1.patch"
-}
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.13.ebuild b/dev-python/celery/celery-3.0.13.ebuild
deleted file mode 100644
index 6b591895268b..000000000000
--- a/dev-python/celery/celery-3.0.13.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.13.ebuild,v 1.2 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.15.ebuild b/dev-python/celery/celery-3.0.15.ebuild
deleted file mode 100644
index cddde22d27d2..000000000000
--- a/dev-python/celery/celery-3.0.15.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.15.ebuild,v 1.2 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.16.ebuild b/dev-python/celery/celery-3.0.16.ebuild
deleted file mode 100644
index 72894eb853b7..000000000000
--- a/dev-python/celery/celery-3.0.16.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.16.ebuild,v 1.2 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.17.ebuild b/dev-python/celery/celery-3.0.17.ebuild
deleted file mode 100644
index e3ba70fda909..000000000000
--- a/dev-python/celery/celery-3.0.17.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.17.ebuild,v 1.2 2013/09/12 22:29:28 mgorny Exp $
-
-EAPI="4"
-
-# Not broken but unsupported; dev-python/redis-py doesn't
-# support python3 which is a dep in tests. pypy fails just 1 test
-PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
-PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[5-6]"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
-HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
-
-# jython would need: threadpool, simplejson
-# python2.5 would need: ordereddict, test? unittest2
-# python2.6 would need: multiprocessing, test? simplejson
-RDEPEND=">=dev-python/kombu-2.4.7
-	<dev-python/kombu-3.0
-	sql? ( dev-python/sqlalchemy )
-	dev-python/python-dateutil
-	>=dev-python/anyjson-0.3.3
-	dev-python/pyparsing
-	>=dev-python/billiard-2.7.3.17
-	dev-python/pytz
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/gevent
-		>=dev-python/mock-0.7.0
-		virtual/python-unittest2
-		dev-python/pyopenssl
-		dev-python/nose-cover3
-		dev-python/sqlalchemy
-		dev-python/pymongo
-		dev-python/redis-py
-		dev-db/redis
-	)
-	doc? (
-		dev-python/docutils
-		dev-python/sphinx
-		dev-python/jinja
-		dev-python/sphinxcontrib-issuetracker
-		dev-python/sqlalchemy
-	)
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	dodocs() {
-		echo "test $PYTHON_ABI"
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir docs/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_install() {
-	distutils_src_install --install-scripts="/usr/bin"
-
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
-
-	if use examples; then
-		insinto usr/share/doc/${P}/
-		doins -r examples
-	fi
-	use doc && dohtml -r docs/.build/html/
-}
diff --git a/dev-python/celery/celery-3.0.19.ebuild b/dev-python/celery/celery-3.1.11.ebuild
similarity index 56%
rename from dev-python/celery/celery-3.0.19.ebuild
rename to dev-python/celery/celery-3.1.11.ebuild
index 3fca227ce352..7ccc249909fc 100644
--- a/dev-python/celery/celery-3.0.19.ebuild
+++ b/dev-python/celery/celery-3.1.11.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/dev-python/celery/celery-3.0.19.ebuild,v 1.6 2013/09/12 22:29:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.1.11.ebuild,v 1.1 2014/05/04 10:18:35 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3} )
 
 inherit distutils-r1
 
@@ -15,39 +15,38 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
+IUSE="doc examples redis test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
-
-RDEPEND="<dev-python/kombu-3
-		>=dev-python/kombu-2.5.10[${PYTHON_USEDEP}]
+RDEPEND="<dev-python/kombu-4
+		>=dev-python/kombu-3.0.15[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 		dev-python/pyparsing[${PYTHON_USEDEP}]
-		>=dev-python/billiard-2.7.3.28[${PYTHON_USEDEP}]
+		>=dev-python/billiard-3.3.0.17[${PYTHON_USEDEP}]
+		<dev-python/billiard-3.4[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/gevent[${PY2_USEDEP}]
-		>=dev-python/mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		virtual/python-unittest2[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/nose-cover3[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/pymongo[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		dev-db/redis
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}]
+			>=dev-db/redis-2.8.0 )
 	)
 	doc? (
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)"
+		dev-python/sqlalchemy[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/celery-docs.patch )
+PATCHES=( "${FILESDIR}"/celery-docs.patch
+		"${FILESDIR}"/${P}-test.patch )
 
 python_compile_all() {
 	if use doc; then
@@ -57,21 +56,15 @@ python_compile_all() {
 }
 
 python_test() {
-	if [[ "$EPYTHON}" = python3* ]]; then
-		ewarn "dep gevent of testsuite doesn't support python3"
-		ewarn "testsuite also needs re-writing for py3 despite citing py3k"
-	else
-		nosetests || die "Tests failed with ${EPYTHON}"
-		# These have some failures, filed upstream
-		#einfo "running funtests"
-		#"${PYTHON}" funtests/setup.py test || die "Failure occured in funtests"
-	fi
+	# https://github.com/celery/celery/issues/1964
+#	nosetests -e test_cleanup || die "Tests failed with ${EPYTHON}"
+	nosetests || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
 	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd" celery
-	newconfd "${FILESDIR}/celery.confd" celery
+	newinitd "${FILESDIR}/celery.initd-r1" celery
+	newconfd "${FILESDIR}/celery.confd-r1" celery
 
 	use examples && local EXAMPLES=( examples/. )
 
diff --git a/dev-python/celery/files/celery-3.1.11-test.patch b/dev-python/celery/files/celery-3.1.11-test.patch
new file mode 100644
index 000000000000..311de2d11445
--- /dev/null
+++ b/dev-python/celery/files/celery-3.1.11-test.patch
@@ -0,0 +1,19 @@
+https://github.com/celery/celery/commit/fb48b1f357f7a416d1413d0056158a74191185af.diff
+diff --git a/celery/tests/backends/test_mongodb.py b/celery/tests/backends/test_mongodb.py
+index f7546d3..a32d9ed 100644
+--- a/celery/tests/backends/test_mongodb.py
++++ b/celery/tests/backends/test_mongodb.py
+@@ -253,8 +253,8 @@ def test_restore_group(self, mock_get_database):
+         mock_collection.find_one.assert_called_once_with(
+             {'_id': sentinel.taskset_id})
+         self.assertEqual(
+-            ['date_done', 'result', 'task_id'],
+-            list(ret_val.keys()),
++            list(sorted(['date_done', 'result', 'task_id'])),
++            list(sorted(ret_val.keys())),
+         )
+ 
+     @patch('celery.backends.mongodb.MongoBackend._get_database')
+#diff -ur celery-3.1.10.orig/celery/tests/backends/test_mongodb.py celery-3.1.10/celery/tests/backends/test_mongodb.py
+#--- celery-3.1.10.orig/celery/tests/backends/test_mongodb.py	2014-02-28 21:43:26.000000000 +0800
+#+++ celery-3.1.10/celery/tests/backends/test_mongodb.py	2014-04-17 11:43:00.818430253 +0800
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 977841dac5d2..6e1f662852aa 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -4,3 +4,4 @@ DIST CherryPy-3.2.0.tar.gz 921937 SHA256 0a70d163ee33b892df064ab70d097d0fc125c74
 DIST CherryPy-3.2.1.tar.gz 568070 SHA256 e1d1f51dd51ebf11efb157c36a4b8df4f5d5cb62af073b3ca50a9284ce83128d SHA512 8c8e5672bebfdcada7ffed17f2f160154db00d2c42b78b53277292c443495dfd2f8c07d2cbb1496c5cd39219b338e93e9efc8989ebcf04fcedc8f40beab97a8a WHIRLPOOL 22daf41e03854edbd53ceb711d002d0cb67f2c3df5319f347dc16d01d57058a7fe6b77abb3184fe77fbbb00777ab9947dc08d5dd06e585b71dc20b441833c6de
 DIST CherryPy-3.2.2.tar.gz 414099 SHA256 dc5a88562795c2ee462dac5b37aba1cf4f34f3e27281ec11049227039308b691 SHA512 89cebf63d48df5bec880bcbc13b3e2ae6da76f59c06803177cc8d6905e2d4444de7bb9a63189e3d6a3fd82e2a2464f419cfa74c60b2765e9ef89866847d55b7e WHIRLPOOL b9407b60d6138e00f1ead9367f973a34fd591ab858a836251a70c8df693f2d62cb06d4497b19e147fbd963bccf3ba9cafbf57dbacceb8241653d55400bfd2a7a
 DIST CherryPy-3.2.5.tar.gz 423774 SHA256 1a0ce16d06d9d3b587af6122b7b19c9a9ce521d51640d21a155626c9c76aa7e7 SHA512 562a8dbacf35dc64ba015ab01cdf076eb6c58a21df67fc9cb3936ff37f3d6dad6271595ba431920533f3cc6c6c10896d9a36e818fada70d87ae041d7f00d97d8 WHIRLPOOL 65aa21bbe77c720f999bc07d57dfe191a9eb96f8740c941b4bc0e3279fb863e2685bf8b0a388a7bf745993964c16117ed367eff371dc0e3dc4dee3bf13fc95cd
+DIST CherryPy-3.3.0.tar.gz 429204 SHA256 f8829bf1b4f613833b690b33b2fd00b1da4ef98df3c70240f78ee91b70f4a5a2 SHA512 605d1ca5694cd8c5237f2115ef2ca39d7290b90c82b91c3699cfb59ad346c3506a1b78ad0502f89de43f8711d01afbbc2eb82f00f86ffbc0fcd63c1def88f0a4 WHIRLPOOL 406c735ae3b5f52408bab6fdde32684caeeb2092b4b0124b12cd43923beb1b11e899069ed48d395839bbb55e202e748ad2cb4e0c626ed29a0d2ff0bfef8aae5b
diff --git a/dev-python/cherrypy/cherrypy-3.3.0.ebuild b/dev-python/cherrypy/cherrypy-3.3.0.ebuild
new file mode 100644
index 000000000000..b6ecb21404bd
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-3.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.3.0.ebuild,v 1.1 2014/05/03 16:51:59 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
+
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-test_config.patch" )
+
+python_prepare_all() {
+	# Prevent interactive failures (hangs) in the test suite
+	sed -i -e "s/interactive = True/interactive = False/" cherrypy/test/webtest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# https://bitbucket.org/cherrypy/cherrypy/issue/1306
+		-e test_session
+
+		# https://bitbucket.org/cherrypy/cherrypy/issue/1308
+		-e test_file_stream
+
+		# https://bitbucket.org/cherrypy/cherrypy/issue/1315
+		-e test_HTTP11_pipelining
+	)
+
+	# This really doesn't sit well with multiprocessing
+	nosetests "${exclude[@]}" < /dev/tty || die "Testing failed with ${EPYTHON}"
+}
+
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
diff --git a/dev-python/cherrypy/files/cherrypy-3.3.0-test_config.patch b/dev-python/cherrypy/files/cherrypy-3.3.0-test_config.patch
new file mode 100644
index 000000000000..55c719564621
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-3.3.0-test_config.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Mike Gilbert <floppym@gentoo.org>
+# Date 1399130996 14400
+#      Sat May 03 11:29:56 2014 -0400
+# Node ID f8f63e119bd85b16bdee9b95195aba60d5fbca27
+# Parent  60c8bb0cd34632becb758a063032e76c13dc3425
+Remove unicode literal to avoid syntax error in python3.2
+
+diff --git a/cherrypy/test/test_config.py b/cherrypy/test/test_config.py
+--- a/cherrypy/test/test_config.py
++++ b/cherrypy/test/test_config.py
+@@ -206,7 +206,7 @@
+ 
+         if not compat.py3k:
+             self.getPage("/repr?key=thing3")
+-            self.assertBody(repr(u'test'))
++            self.assertBody(repr(unicode('test')))
+ 
+         self.getPage("/repr?key=complex")
+         self.assertBody("(3+2j)")
diff --git a/dev-python/demjson/Manifest b/dev-python/demjson/Manifest
index 5af0251cc4e3..67053c63fd7b 100644
--- a/dev-python/demjson/Manifest
+++ b/dev-python/demjson/Manifest
@@ -1 +1,2 @@
 DIST demjson-1.6.tar.gz 64299 SHA256 1d989c310e33569ecc178b8182e53bde8f748bf5ea10cfbc0e331f8c313f6e29 SHA512 aad21fb11998fc2bd6d9ce6cf3be448d0cb6636716109384dcf268aa3b5c6e37f20e579e51d72e554de3e9e4857b7ea850727009bf72bf020ee0f305e3c258f9 WHIRLPOOL efef0bd9e180b52c8d176e65302f0e9850cd30e8eae28323e7a3abe60319a81f1f1f5019ba5835937544816bea8965746276b6597dce610224193dfc5d415a65
+DIST demjson-2.0.tar.gz 184959 SHA256 dcc407b6c80187ce8e520d5c8ee0b2f1a95be1329e8b3adaaa281322974fd1d2 SHA512 9d9286dc9ab208c814c2d9f43737deb3c8e5a60eb9d48ec4550289f490140507b2bcceed0d38f65cc4f027f1880a7dea676e50fc18a41dd03df7a6ac53bc246b WHIRLPOOL 56533904d94595f6dc0433eef37a34bb927093180ccbdd8a4841853cf7e9ac8bab33b729770e8db2d82bf19de5177cc662148ea806f66ecea6edaec6bd3ca74f
diff --git a/dev-python/demjson/demjson-2.0.ebuild b/dev-python/demjson/demjson-2.0.ebuild
new file mode 100644
index 000000000000..7ee733567420
--- /dev/null
+++ b/dev-python/demjson/demjson-2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/demjson/demjson-2.0.ebuild,v 1.1 2014/05/03 07:48:21 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="encoder, decoder, and lint/validator for JSON (JavaScript Object Notation) compliant with RFC 4627"
+HOMEPAGE="http://deron.meranda.us/python/demjson/ http://pypi.python.org/pypi/demjson"
+SRC_URI="http://deron.meranda.us/python/${PN}/dist/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	cd test
+	if python_is_python3; then
+		2to3 -w --no-diffs test_demjson.py
+	fi
+	"${PYTHON}" test_demjson.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index 2718a218eee3..4b9e47aa9113 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -1,3 +1,4 @@
 DIST django-pipeline-1.2.9.tar.gz 31805 SHA256 2838b7fb359112121d4fcb06c96ab5e1de8d9abbb578016747dc0c6c2cf0ae8a SHA512 d02b4a65738b794d919e88c4f57ab587c22f032d8e9e4cf951ba49580b986f4d8d6c533804e89ab06649aaed7b9893671530319ae3e627fa755f261c35a6c68c WHIRLPOOL ac574eb4fb9b69500825da7587ff6afacda9c2dd5345896a7a99c0c65ade5087d541cb465ef1121e6060d9a035bf52c310985d8bddc01443887386a6423aaee5
 DIST django-pipeline-1.3.15-gh.tar.gz 36960 SHA256 9af008057532c7707ffb231b1919b127076b4c3a5e70f18af0a3fdc8effaaf91 SHA512 8580a06169f34434a492b925f1cfcf319ccf39597da9d4ba6b827e7ced4531fdf8b419f4ee2eacfad5f8bc7a73b1eef2f587a912dd552d084566622db85a927e WHIRLPOOL ef6ce9020382d44df4ab10dab31affb49a26dcf095a2590e98ba9a2838049f07fe8ed7f8dcf78693e63b36ae605cd699f85ab8dae5396ecaeab7f2f147e1cd28
 DIST django-pipeline-1.3.16-gh.tar.gz 37365 SHA256 c2a32e3947fed387307d8ba8040bd3a116bc8de0fa938024e8f41c5859f232f4 SHA512 3f584d4a99e0e7dedc76005c944c7949c054e649dbe05dfe5fe59706693807350bfd973415e99e34318ff1361367a06288dfc715032cf77e7dd40395aedbbac7 WHIRLPOOL fcdafe48ae27d46c6f5f34e1217c9b9bc71730d2fc0e846da35f12cdbfee249e42a3574275490cebc904bc3816f03f3358959cbd6ca10700bc0bfa9fbc05c74c
+DIST django-pipeline-1.3.17-gh.tar.gz 37748 SHA256 d41b1c502bc2000cccb65cbab392edbe63b176c520d1c9538f1f9641f0dcb1c9 SHA512 97a7f234bf729922a60f64fe3d23206e06e20be079a640ccddd27746ded0d8a882d849c907600d43731f51f39f75ef9a2696c34f849a4e39b4a6153ec3d70f07 WHIRLPOOL 150997f4cb5c348742e70f7ac8d77b0591f6b421427364988fd4d97e43291f1fffecb4f9e0a4df054237427d531f62f524ad5fdd8c7fdc6b4427085c80fc2343
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.17.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.17.ebuild
new file mode 100644
index 000000000000..c179cd9a7834
--- /dev/null
+++ b/dev-python/django-pipeline/django-pipeline-1.3.17.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.17.ebuild,v 1.1 2014/05/03 09:33:40 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="An asset packaging library for Django"
+HOMEPAGE="http://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
+
+# PyPi releases lack docs/ subdir:
+# https://github.com/cyberdelia/django-pipeline/pull/254
+SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/django-1.5.6[${PYTHON_USEDEP}]
+	dev-python/jsmin[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+# As usual for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 7fc0cabbe77d..41594f5b88a0 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,3 +1,6 @@
 DIST Django-1.4.11.tar.gz 7752172 SHA256 4819d8b37405b33f4f0d156f60918094d566249f52137c5e6e0dbaa12995c201 SHA512 60cc3c769a9b21e93e6c4e79132ab8f4a48df1cb1c55faaa547c5fd28b9785ddca3b5393790bf96a4715d9b708c6da376ef4a28ec14849147d63f0fe40d386cb WHIRLPOOL 5db11c57bbfafafd9484b8674412b32cfb3531b11b5f51e7b73a313c24473b182b014ba2ab193373c1796bcefc38c85580dcda05f2aab32463db4af78afd232a
+DIST Django-1.4.12.tar.gz 7752752 SHA256 2b9164dc3b26e077590c6ebb95996aab0e66fe3298113fafe960c4ff7fb53e25 SHA512 882e832d1f1b5c56195b7ca6a75c4351304f79c9b51dbbce61648325553606c0b64bd3b050cf221a283de9246a8713137a5e290c756b2544450bd3f7c82818d4 WHIRLPOOL e98eed8ce1d3716cd297a08bf7d52fe369cabe2b73bbd21e8db8fc7edbd09b4331cdab5ee9f190d2d72c4ce5bf9eb2cc4f5c4670a9b752ebf2b5dca714dd0502
 DIST Django-1.5.6.tar.gz 8068359 SHA256 9b7fcb99d20289189ec0f1e06d1d2bed3b4772e3a393fddbfb006ea7c3f9bfaf SHA512 df266732742e4ff50d362aec870e9ca08213ede80894ddd297d1fee2141ba44b728e8acb4869cb3b50a06517fb04ae66d30e57deaf7e1426e886a5e094b41741 WHIRLPOOL 0f392d9ddf9ae0e3c503b7519e4f626931ba41f4d40f8def7df401e57c53c3c11ebf45ea334183d6c9d5cc400a9bf23cd514620ec1da46beab9c7b57d86f7e4c
+DIST Django-1.5.7.tar.gz 8069177 SHA256 08a41c2a37451b8cc1136823b802dd6f17ad6ec0c8d2cadb4c9a219ff4c08593 SHA512 a7f4bfa7aa8f8e32dd20a7da8ae904061f756126847789c5d318c599158d22bbf23f5e1cbdfc59c60aaef23021335ce0698cbe1e5c6c6bf394fce6e905d53f88 WHIRLPOOL a6c8dc3a9addf9b0a1700a0b5eb0f78a0a5912d5b38f3bcd5f48f52c97c51bcf4e9308b8ca2e33665a178bffd536e5bf1a4674c21e682d5dc7c208690968c337
 DIST Django-1.6.3.tar.gz 6628812 SHA256 6d9d3c468f9a09470d00e85fe492ba35edfc72cee7fb65ad0281010eba58b8f1 SHA512 3b5167df5aa1d2eacf5ff1d989e6304f8f86f71d69aa9aff93d4f1b3b8459d1bec0691cc49007c4e20e700f86849b95affd2dee212fd46a6a4732c2b540f568c WHIRLPOOL 1e740899757544fe64458be6815da538bb59a96f7cc8dbd60965cf1676b14586cb769db5f1db7b1e80d054ffae85825856f62265b4d1c0e49f6c1940adbea224
+DIST Django-1.6.4.tar.gz 6630474 SHA256 ceee0beea79b1926c767aaa837e1b9e621e5f6b7d27138d90474b3917ca5527b SHA512 319e0ee8f71073b0132d3e06ffccca8580adeece0183dc064492ccd6d4f2d60e92fe89191b9d35ce44d5c391a02388b464821d2048a7fe87886d7556f0b95aa7 WHIRLPOOL 232a66bcaeb99ead521eca157ef9df83b866a6224cb4d162fd37dcff7cca71fd6cc0f318a9480fd7a8b15f35da4bed4ab7905460d701e8a766e362627f394b13
diff --git a/dev-python/django/django-1.4.11.ebuild b/dev-python/django/django-1.4.11.ebuild
index e9d8d3ccb1fd..fbf7e4c7afb3 100644
--- a/dev-python/django/django-1.4.11.ebuild
+++ b/dev-python/django/django-1.4.11.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-python/django/django-1.4.11.ebuild,v 1.3 2014/04/27 09:09:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.11.ebuild,v 1.4 2014/05/03 01:57:47 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='sqlite?'
 
 inherit bash-completion-r1 distutils-r1 versionator webapp
diff --git a/dev-python/django/django-1.4.12.ebuild b/dev-python/django/django-1.4.12.ebuild
new file mode 100644
index 000000000000..7e6db301d1d8
--- /dev/null
+++ b/dev-python/django/django-1.4.12.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.12.ebuild,v 1.1 2014/05/03 01:57:47 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+inherit bash-completion-r1 distutils-r1 versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="mysql postgres sqlite test"
+
+RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_correct_url_value_passes/_&/" \
+		-e "s/test_correct_url_with_redirect/_&/" \
+		-i tests/modeltests/validation/tests.py || die
+	sed \
+		-e "s/test_urlfield_3/_&/" \
+		-e "s/test_urlfield_4/_&/" \
+		-e "s/test_urlfield_10/_&/" \
+		-i tests/regressiontests/forms/tests/fields.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. \
+	"${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	# Port conflict in django.test.testcases.LiveServerTestCase.
+	# Several other races with temp files.
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp extras/django_bash_completion ${PN}
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to"
+	elog "webapp-config for installation in a webroot,"
+	elog "as well as the traditional location in python's"
+	elog "site-packages dir for easy development"
+	elog
+	ewarn "If you build Django ${PV} without USE=\"vhosts\""
+
+	# XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
+	ewarn "webapp-config will automatically install the"
+	ewarn "admin media into the localhost webroot."
+}
diff --git a/dev-python/django/django-1.5.7.ebuild b/dev-python/django/django-1.5.7.ebuild
new file mode 100644
index 000000000000..bd12637af0b1
--- /dev/null
+++ b/dev-python/django/django-1.5.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.7.ebuild,v 1.1 2014/05/03 01:57:47 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite test"
+
+PY2_USEDEP=$(python_gen_usedep 'python2*')
+RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5.4-objects.patch \
+		"${FILESDIR}"/${PN}-1.5-py3tests.patch )
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	# https://code.djangoproject.com/ticket/20514
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	# Port conflict in django.test.testcases.LiveServerTestCase.
+	# Several other races with temp files.
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-1.6.4.ebuild b/dev-python/django/django-1.6.4.ebuild
new file mode 100644
index 000000000000..deb9bd118165
--- /dev/null
+++ b/dev-python/django/django-1.6.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.4.ebuild,v 1.1 2014/05/03 01:57:47 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite test"
+
+PY2_USEDEP=$(python_gen_usedep 'python2*')
+RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5-py3tests.patch \
+		"${FILESDIR}"/${PN}-1.6-objects.patch )
+
+python_prepare_all() {
+	# Avoid test failures with unittest2 and Python 3.
+	sed -e "s/from unittest2 import \*/raise ImportError/" -i django/utils/unittest/__init__.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	# https://code.djangoproject.com/ticket/20514
+	# https://code.djangoproject.com/ticket/21093
+	# export PYTHONWARNINGS="d,i::ImportWarning"
+	sed -e 's:test_dont_base64_encode:_&:' -i tests/mail/tests.py || die
+	PYTHONPATH=. \
+		"${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	# Port conflict in django.test.testcases.LiveServerTestCase.
+	# Several other races with temp files.
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/drpython/Manifest b/dev-python/drpython/Manifest
index f0f0c7f6cce5..566095771060 100644
--- a/dev-python/drpython/Manifest
+++ b/dev-python/drpython/Manifest
@@ -1 +1,2 @@
 DIST DrPython_3.11.3.zip 636799 SHA256 62672a0a25a60f8efa976b2329108e129c7b1977b1e4975b46607dd61cf80f48 SHA512 92317f2e39738490200980e9a8aff00fa1181b5e5eb042b656ce604db713a240d0e6de72714b5f84dd12a18ca9d7afd246f4f1a2fa38e299a95cf763ae67bb04 WHIRLPOOL 6b95ebff4ade2dce1e4f96543416af6facb669d346f6e4a87daeef15da8abf67017fe7a75fffe542c9b8de366094550814a7a71f3bb29617b59bbfca67644569
+DIST DrPython_3.11.4.zip 824982 SHA256 37a2e4873fb6accd1145f89518db101458c2f43fbc3ea7cf3e2de446bf353f42 SHA512 13943eb28d7155e99e0ffb57903ddde25c964c908ac848f14041c456bc6aa71bab7cad1101e489c09ba5efb5af35e33895a518021bb607f5047844927bcebf2b WHIRLPOOL 56fd68e4abda8f39bbd86060eb397d4bd9360547e26cbca875f8256cadc19efd5de4bedb6d61f116cf63b3cd5167bf0dec9e21bddbbd0d75fdb6c246350ba483
diff --git a/dev-python/drpython/drpython-3.11.4.ebuild b/dev-python/drpython/drpython-3.11.4.ebuild
new file mode 100644
index 000000000000..79b87aa64abf
--- /dev/null
+++ b/dev-python/drpython/drpython-3.11.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-3.11.4.ebuild,v 1.1 2014/05/04 11:41:05 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="DrPython"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="A powerful cross-platform IDE for Python"
+HOMEPAGE="http://drpython.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/wxpython-2.6"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+PAYTCHES=( "${FILESDIR}/${PN}-165-wxversion.patch" )
+
+python_prepare_all() {
+	sed \
+		-e "/'drpython.pyw', 'drpython.lin'/d" \
+		-e "/scripts=\['postinst.py'\],/d" \
+		-i setup.py || die "sed failed"
+	sed -e "s/arguments)c/arguments)/" -i examples/DrScript/SetTerminalArgs.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	make_wrapper drpython "${PYTHON}" $(python_get_sitedir)/${PN}/drpython.py
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	elog "DrPython plugins are available on DrPython homepage:"
+	elog "http://sourceforge.net/projects/drpython/files/DrPython%20Plugins/"
+}
diff --git a/dev-python/drpython/files/drpython-165-wxversion.patch b/dev-python/drpython/files/drpython-165-wxversion.patch
index 5fb798805c3c..bab247c2110c 100644
--- a/dev-python/drpython/files/drpython-165-wxversion.patch
+++ b/dev-python/drpython/files/drpython-165-wxversion.patch
@@ -1,6 +1,6 @@
 diff -Naur drpython-orig/drpython_wx26.py drpython/drpython_wx26.py
---- drpython-orig/drpython_wx26.py	2007-03-23 19:20:02.000000000 -0600
-+++ drpython/drpython_wx26.py	2007-12-03 18:36:01.000000000 -0600
+--- drpython_wx26.py	2007-03-23 19:20:02.000000000 -0600
++++ drpython_wx26.py	2007-12-03 18:36:01.000000000 -0600
 @@ -34,7 +34,7 @@
  
  ## testfile for older version
diff --git a/dev-python/encore/Manifest b/dev-python/encore/Manifest
index ea441a55ae37..fb78dc54656e 100644
--- a/dev-python/encore/Manifest
+++ b/dev-python/encore/Manifest
@@ -1,2 +1,3 @@
 DIST encore-0.3.tar.gz 104057 SHA256 994a564140327a2caf9147407d42c249e1b10ccce76b506bbe3016fd76c14261 SHA512 d5ba216cc7cb3181b20d7cf4362def8a52f7d940380791c863b7e6b9f8c35f8c6eee1d2d3c9dd81fa593db92ccb22e6980e4e3582ce0be029a4511b11b9fe16b WHIRLPOOL 3a0e20b09dd4e47eb2ec015cc89c9123804a8c6ed9d8a31a4c60c913099741047c92663d34698835dc40d3d75055fababf789231e348139be35c1923e2403ea3
 DIST encore-0.4.0.tar.gz 51877 SHA256 22afbd51fc72dc0139c46bf02752e3213573fc54bdf764656dc6cea7d8846c2c SHA512 5a2bed4d47225e2fdd0f4c914e18c1fc4b8b4782c4be5d62b91c7ca7ae8b5a19598ebeeddc5d6a2531217b011021b3dd14b846f23f338447ce922de628529e4c WHIRLPOOL 1b124fad326a58ff65b85fcb54280ddc51dc14805f78ed5b6f9a4f10b21848ffac3a3e62d4ee0bdd53ee52aae4a7637cdf2d79b6b55905e807aada81bcc16169
+DIST encore-0.5.1.tar.gz 71248 SHA256 0e90fd798e3b274b7f41e2989f27a22b41ec331976753a804f27f5781012c3b2 SHA512 410d37bd326ac5b8433dd5896c3e167387e83380cc55efa7405b4c3f918108cee60e6d3c78c3ff41aa2b1f46939cb3c4e2e495b9f77a9c2483a77e1973bd2d17 WHIRLPOOL 3ed37349e3ad5db6979472b2808a11b7f43cc7e1074265dfb2ed2480b2890dca64af86e66bad9578184915f4e24577ab1715defeaba8e6610e33292fdab6fd16
diff --git a/dev-python/encore/encore-0.5.1.ebuild b/dev-python/encore/encore-0.5.1.ebuild
new file mode 100644
index 000000000000..dca1a1fd3ef2
--- /dev/null
+++ b/dev-python/encore/encore-0.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v 1.1 2014/05/03 08:30:43 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Enthought Tool Suite: collection of core-level utility modules"
+HOMEPAGE="https://github.com/enthought/encore"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	if [[ ${EPYTHON} == python2.6 ]]; then
+		ewarn "Tests disabled for ${EPYTHON}"
+		return 0
+	fi
+	nosetests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 858fa57f9c0d..0b79498bb136 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,2 +1,3 @@
 DIST Flask-WTF-0.9.3.tar.gz 245191 SHA256 aed572a8245608cb259cf4e0d7faaa448b9a7105866688567dbfb18771f5ecda SHA512 b9e49cb13c377a0a588d272afcb1f3ebe23ca7d21fd97a6321d1fc7ff055fb0e3d68fdeed6a39e59f56e5808f9b79344f46cfd564559990c71eb7c3408b021a3 WHIRLPOOL 43cb09ea33adb4f87f8b034d8252af3e54769d99fd18c6bd19001a6a4638597252a8a3b16c8b90a89189ae98376d700b8a86c0e8af6f929e3349faca5b14817f
 DIST Flask-WTF-0.9.4.tar.gz 245677 SHA256 46a18e11a6e212f1120a8f4072b814c833e82f369af2411b1b42a89399ecebf9 SHA512 b170bea874a71e20e14440aa65075ec0bb50d77916a17874b84a985113738d505d8b0b9a3b8ab75bc8a32429c98a558de804fcf04ab1ba50a0b121fc42ac2c7e WHIRLPOOL 627107a7ae00cbeee25e01923fc5c0f90cc0d94b03600726a0d96de38273c68434c0cc0b5705ed78db3dcb39b79a538d53f88d9a4a6bdddf3b5ee7b4be002c10
+DIST Flask-WTF-0.9.5.tar.gz 245815 SHA256 c5ee61a3431c68b0f983ff6ce1b625f41d74e6e45b3738c73ceeb58dfc06d220 SHA512 3f2880be82e793de0c371629b0922a10d21d2ece53f14763cf09afbe24415af51edd36d70bb65f2141669592f2d2fb36f5f17f4d70b8ac83078694ef9a883fc8 WHIRLPOOL 422b2b15d25329c3a5ed307f015b3b8d5c3c130477608d7fc2a55f7c9bab82559ad8cd1c14c723a8fe45f02ee27b18558a928636be697504ebd9ef1055cfd612
diff --git a/dev-python/flask-wtf/flask-wtf-0.9.5.ebuild b/dev-python/flask-wtf/flask-wtf-0.9.5.ebuild
new file mode 100644
index 000000000000..545310b0a0af
--- /dev/null
+++ b/dev-python/flask-wtf/flask-wtf-0.9.5.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/flask-wtf/flask-wtf-0.9.5.ebuild,v 1.1 2014/05/03 08:38:27 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PN="Flask-WTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple integration of Flask and WTForms, including CSRF, file upload and Recaptcha integration."
+HOMEPAGE="http://pythonhosted.org/Flask-WTF/ https://pypi.python.org/pypi/Flask-WTF"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-1.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-testing[${PYTHON_USEDEP}]
+		dev-python/flask-uploads[${PYTHON_USEDEP}]
+		dev-python/speaklater[${PYTHON_USEDEP}]
+		dev-python/flask-babel[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 21615eb87cf9..43ece64ddb46 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1 +1,2 @@
 DIST isodate-0.4.9.tar.gz 24820 SHA256 4e13c0b5824e9af40d99ad1d3969c880e49b6b09e4de138aa08db3d571b2190d SHA512 a59b7d2ce417b40cb6365f87ad8f1dbba58fd356edaa450510453630ef81c4fa308ab3a45b680de5451ec8d5d2b67fa75980a3ba006c51b73860ca96e1a94b6a WHIRLPOOL b6fa919b31ea3aae7acd23d6fe98284ffad9d39a3025a708953a0434d84192bf4bd2d4ae96fc2f137682dca021e79537152a7d57e5d76c43b149c1f898eaf28a
+DIST isodate-0.5.0.tar.gz 25917 SHA256 f3e436a9c321882942a6c62e9d8ea49787b4c0ea7f7bb3cbd047bcf76bd0dfbe SHA512 5f45fee798e8f79a5f9f271570d542fb68936577e3670a675e66e037bb15d76653717d7fcdeae1cd6ae9afb2f153206210c40d4cfcd8bd60c3ed873d2e6b19d4 WHIRLPOOL a9a62054c5b050a20240699a0955cf1a59f7c9afb4b163f0ef16b6fce578263881e3c8d77dc15a3ac1d11a341f64073685aa8a1d533391884d2d5f956f76a1a0
diff --git a/dev-python/isodate/isodate-0.5.0.ebuild b/dev-python/isodate/isodate-0.5.0.ebuild
new file mode 100644
index 000000000000..9364eac3d041
--- /dev/null
+++ b/dev-python/isodate/isodate-0.5.0.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-python/isodate/isodate-0.5.0.ebuild,v 1.1 2014/05/03 08:18:21 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="ISO 8601 date/time/duration parser and formater"
+HOMEPAGE="http://pypi.python.org/pypi/isodate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGES.txt README.rst TODO.txt )
+
+python_test() {
+	local test
+	pushd "${BUILD_DIR}"/lib/
+	for test in ${PN}/tests/test_*.py
+	do
+		if ! "${PYTHON}" $test; then
+			die "Test $test failed under ${EPYTHON}"
+		fi
+	done
+	# Give some order to the output salad
+	einfo "Testsuite passed under ${EPYTHON}";einfo ""
+}
diff --git a/dev-python/llvmpy/Manifest b/dev-python/llvmpy/Manifest
index b4e4be3f341a..673cd48b1fa9 100644
--- a/dev-python/llvmpy/Manifest
+++ b/dev-python/llvmpy/Manifest
@@ -1,3 +1,4 @@
 DIST llvmpy-0.12.2.tar.gz 570250 SHA256 fd619c872d4c516111fc36c814f6c0112fb3764f02be258c920818ab405484ca SHA512 5a988e994c5c3ab2c00edd4d9df1ec3dcef8774bb10bcc789f7540f88f4a0fd2f7c0374fd96b7ed4e2a923781834b3b1f0aba52bc5fd828553cddf07767e9c82 WHIRLPOOL 3aa4de9e28e6a748300f85f1ddfe63f15df65ad83e67dcbdbd21d0aa923c55ac659813bbc375b68931ba86e4831842d5c5d5463ec4b523821c751953c018fb1c
 DIST llvmpy-0.12.3.tar.gz 570289 SHA256 864e4a216e2f68b4f05b7a9e41ed200599b9396216b3ed76612b9d4a1cf98ffe SHA512 7155c900f70aef6522cb975f1be6a90cccb1c5c0f2b5a70369757eafe7562ae4324d08cd2f161ddea9af9dfd48c9d0b3049b703cfb4c4dbf0a5a88e50d8999a7 WHIRLPOOL f01fff9b04fa19a2ade70db13bfef23e83637861efd209d82fb1060888c0ec181498fc290d437ea4fff9056a7586c1fceade2bf25ddddf3ebc98715f2551f663
 DIST llvmpy-0.12.4.tar.gz 570572 SHA256 7f09e1626e890b5ebe916278ed13be0da1dfb66d9cda33acc2c61e91e06da806 SHA512 4efc8f040b68d729387f211b9cdd02d705abaae2f20a283da3f617f7417fcc0181319fcc3cf673ad9c6df6907c705932802eb0b7e0fff1bc3c9d32480d8270c1 WHIRLPOOL 68c6af1288407f7237cd526e9d30782e47e891ef951dc68a8f6d0611fb781706df68c542de9c953efd09d88fe03340fe88f9c7e16625c3eb4ef2bdb18b4d7101
+DIST llvmpy-0.12.5.tar.gz 570612 SHA256 b95c5c633c8475c1b7a63eda2759fb255a46e064ef2174841a7e75400091a387 SHA512 9d77c3ca5603580a2e0c5944d859424fa85801986ecf53ec8d6fd0386dab77b9936e9af369e7d231d9b31bc658ffdbeece0b273111965fbda33f7cf2d7de5b67 WHIRLPOOL 47982d39076de86415c160acc3498e9236020097af2402bbfecdd348af3306ed9176af72afc68273fcc599c591664058bfd176886a8603ffb68adf7b6c87bc34
diff --git a/dev-python/llvmpy/llvmpy-0.12.5.ebuild b/dev-python/llvmpy/llvmpy-0.12.5.ebuild
new file mode 100644
index 000000000000..c02982ba0d3a
--- /dev/null
+++ b/dev-python/llvmpy/llvmpy-0.12.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/llvmpy/llvmpy-0.12.5.ebuild,v 1.1 2014/05/03 07:24:32 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmpy.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# fails with llvm-3.4
+RDEPEND="=sys-devel/llvm-3.3*:=[multitarget]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.2-return-type.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import llvm; llvm.test()" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lxml/lxml-3.3.5.ebuild b/dev-python/lxml/lxml-3.3.5.ebuild
index 1a05f982c776..31a4881dbaee 100644
--- a/dev-python/lxml/lxml-3.3.5.ebuild
+++ b/dev-python/lxml/lxml-3.3.5.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-python/lxml/lxml-3.3.5.ebuild,v 1.1 2014/04/25 05:03:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.3.5.ebuild,v 1.2 2014/05/03 02:29:32 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_{2,3,4}} )
+PYTHON_COMPAT=( python{2_7,3_{2,3,4}} )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
@@ -21,7 +21,6 @@ RDEPEND="
 	>=dev-libs/libxml2-2.7.2
 	>=dev-libs/libxslt-1.1.15
 	beautifulsoup3? (
-		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
 		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
 		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
 		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
diff --git a/dev-python/pSQL/Manifest b/dev-python/pSQL/Manifest
index e1e67d171f17..e874b105d6ed 100644
--- a/dev-python/pSQL/Manifest
+++ b/dev-python/pSQL/Manifest
@@ -1 +1,2 @@
 DIST pSQL-1.2.0.tar.gz 21046 SHA256 fc955844e1263ccaa8e59f10266e280569b8c043c3bade178bda66daf58f80b2 SHA512 f6dc4a87db7faca23a9b70dd20413f9f4f35dee3be001bd443bc8e3bc572316b6103c02de8ff40406811e6c62b40b2b54efa72421dd2742ecc023168c709a3ce WHIRLPOOL 94e1cc3da19b5c2ce5ac9a10710c83ebace2e7e929f061ad670b5baf2af5e38762945fbdba4250961c31d756ed2048f763b9a66d5d99e8b54e9c3d424c5df996
+DIST pSQL-1.2.1.tar.gz 21158 SHA256 9467f379656fa3b4053de67baa5bb0e650f1bcc437bbe0c0a7b088d1bf4e31d0 SHA512 39b21327eb2cd1ad6207c08e2ce6507c7d05992ef852fd06427dcb461e5175b24e983e432c8616c759f291d3bfd9906a654834afa79e37cc7c839ddb5e181779 WHIRLPOOL ed997754faa3b100e38656a6cc5b16574327fe0a05de17516bc5b5e6e5329f42c95151f373f45623bb666ed57c314e43d8562f6aa7944ee7afafb4df6ddaf3ed
diff --git a/dev-python/pSQL/pSQL-1.2.1.ebuild b/dev-python/pSQL/pSQL-1.2.1.ebuild
new file mode 100644
index 000000000000..ad447acf4cda
--- /dev/null
+++ b/dev-python/pSQL/pSQL-1.2.1.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-python/pSQL/pSQL-1.2.1.ebuild,v 1.1 2014/05/03 09:22:02 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-r1
+
+DESCRIPTION="MySQL abstraction layer for python"
+HOMEPAGE="http://software.fionet.com/pSQL/"
+SRC_URI="http://software.fionet.com/pSQL/release/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-python/mysql-python[${PYTHON_USEDEP}]
+	dev-python/egenix-mx-base[${PYTHON_USEDEP}]"
+DEPEND=""
+
+src_install() {
+	python_parallel_foreach_impl python_domodule pSQL.py
+
+	dodoc *pSQL
+}
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 21688458bfec..f2f51f156046 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -2,3 +2,4 @@ DIST pep8-1.2.tar.gz 28194 SHA256 be6a5739f201e020dbcd073439a01d75b7a3547ac88006
 DIST pep8-1.3.3.tar.gz 33591 SHA256 f0697c178f9e1c9ed5071fd1a9a8a99269cf2f66f9ff9a2a0d5d895f0d88210f SHA512 b82486f51c6b47bd7412c1baef620ae40b2bcd22f9ceb35f825c53ca3d85e8e9b67885c9448a91d34de1b409d508fc9aedfc43915d5b2e465c505c06a9431cb8 WHIRLPOOL 293ffcf9aabce7b9198505bdc6f25c946ef044e1a97199d534fd5dad16c15018de0143ac31ad6f8236987031e028a0a3e001ba189d472c74cfbde5e668091143
 DIST pep8-1.4.5.tar.gz 63021 SHA256 dd908e7df835ebb1b82ba0675e1b7e173ea9c55d7ae62808ecad2e6db2a6ee0e SHA512 c4d8e5b116762480e1aad2ddad1cd02d2d74779adcef8153739c7ca1e56d33bd81b42c984c525797548d915245f24d3cea636d6b89ade8e9e428f31b0a6fe8a6 WHIRLPOOL c597328ce58d226311162c7126c949f92e9142f0fa9a979cdd0ede29f71b839587ef4c5cef57ac8fdd608753f52a6c91220b90807ca9b3b56cc5b5772c688b9a
 DIST pep8-1.4.6.tar.gz 65392 SHA256 603a46e5c358ce20ac4807a0eeafac7505d1125a4c1bd8378757ada06f61bed8 SHA512 3752bef4cf8064b6f965bde0ccbe5e546c1e53496814c49d959d2148d9707848d0ebb79c9394f4b1a43575bab61db8ea58ac3bffb24d6f8d41abddffaf483f55 WHIRLPOOL 72b05cd2086e09cbe9e0d67a592324801e945d51f47efa20a16795d2e5e50329acc0cf8d8f3628a666880e80ec391ffb18e6185d5b03a7f11c94ca830af013a9
+DIST pep8-1.5.6.tar.gz 66944 SHA256 1a8be992f8daac6144af0f3972f40159f46d81cb36dde4adeea01576e4bf041a SHA512 9de60df0f56eeb28be835b3f11d060150e08c19403552b769abe0794a1aca65e3a17fd8b45f35b34b11593f527c2f4521ab72823aa1475963b1281c044c71ec1 WHIRLPOOL 97f90d9b4ae69d87cf5eb014998f74d8fc97640a31a457a2b39db495eeb9bc0634d5a56a6bf7636d44dbef70179a3c0c0098e7963a5d63e7d3cfccd0b250675b
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
new file mode 100644
index 000000000000..13f16b33d6dd
--- /dev/null
+++ b/dev-python/pep8/pep8-1.5.6.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-python/pep8/pep8-1.5.6.ebuild,v 1.2 2014/05/04 08:08:36 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="http://github.com/jcrocholl/pep8 http://pypi.python.org/pypi/pep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 4f3d1d0d24e0..18311c8686eb 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -3,4 +3,5 @@ DIST pip-1.4.1.tar.gz 445199 SHA256 4e7a06554711a624c35d0c646f63674b7f6bfc7f8022
 DIST pip-1.4.tar.gz 443790 SHA256 1fd43cbf07d95ddcecbb795c97a1674b3ddb711bb4a67661284a5aa765aa1b97 SHA512 0577f30404e6221714a699ab7a361956a2af0356013807c99a20eae9a838f462aea778770c79a40b6a7d962cdc3eedc887322025c76185ec357a27811bac92ae WHIRLPOOL 92c9ca5d654e2be29ab9df55855e3aa3e2ad0358f460e851b766e787b02b2f3b68462cb319514c14a6f707bb723e6feb85f9ea5456b508b4f45f77a375fe9c24
 DIST pip-1.5.2.tar.gz 1079904 SHA256 2a8a3e08e652d3a40edbb39264bf01f8ff3c32520a79113357cca1f30533f738 SHA512 45ed5140cea031c56b65be56ba45e6e983ef997281660013228988753da32fd11e461a00acedc795a87a556cb171ca7715c1109b680d67f3e40a987b01f90e26 WHIRLPOOL 742488a6958c7d0d4c26e14eaee3aea33d65b47fc77a097362c1853c4c352a9e1157c596a2fa6ba50e0b56160d052586efadd40e6aeffe530d9db674bf03e0f4
 DIST pip-1.5.4.tar.gz 1081874 SHA256 70208a250bb4afdbbdd74c3ac35d4ab9ba1eb6852d02567a6a87f2f5104e30b9 SHA512 5ab83cc64f1bdd5f9a8bbe18653f68dd50c48a627fe120e3d58e26df7958ff4d48baa2334e067ef5d315008ffc08c6042f6d0f1d45a2f25788263c796de2818c WHIRLPOOL 5b6ed33c91b3191b446318e6fdc48c749d95d18ea78d8129bd80ffca48cbb9beb54338864793a8c3b5a4c9f8023b1cba93af9e25d35d428b11509dcfdd4b1a39
+DIST pip-1.5.5.tar.gz 1084356 SHA256 4b7f5124364ae9b5ba833dcd8813a84c1c06fba1d7c8543323c7af4b33188eca SHA512 5de47124b49312ee4e8bfae050fbb7c5c0c0546334945a4442f0ca120629ea2d89305aa4c25b4cddcba1830475142f31bddb51efcde90e47ba0c38a222444477 WHIRLPOOL 1824b98d37e33444d16b60308c109c9e0b131e01cdac983835da0a5e221b7494b7a6a58b00b216361167f544859a16ed54dc26b92bfd24b36a67057c0d4da407
 DIST pip-1.5.tar.gz 898803 SHA256 25f81d1a0e55d3b1709818dd57fdfb954b028f229f09bd69cb0bc80a8e03e048 SHA512 6eb206093012e77fbc1406c7f7103c320e17bb7894406f187987853b3a652714b030841869d434a9b5fc3c8020568d6c5e4a8a86e0555dd9323dbaa1a6120831 WHIRLPOOL 35a558bb04a98628d782be3f66af88f89d84e7a88ad2330f0c3570fa8296cfc801fe7ddd96abf3b42c1ff3337b42388cb141bd75df7484f5a4dcf010cd7fd4c1
diff --git a/dev-python/pip/pip-1.5.5.ebuild b/dev-python/pip/pip-1.5.5.ebuild
new file mode 100644
index 000000000000..7d95186d1139
--- /dev/null
+++ b/dev-python/pip/pip-1.5.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.5.5.ebuild,v 1.1 2014/05/03 07:51:54 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+# required test data isn't bundled with the tarball
+RESTRICT="test"
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	${EPYTHON} pip/runner.py completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	if use zsh-completion ; then
+		${EPYTHON} pip/runner.py completion --zsh > "${COMPLETION}" || die
+		insinto /usr/share/zsh/site-functions
+		newins "${COMPLETION}" _pip
+	fi
+}
diff --git a/dev-python/pydns/pydns-3.0.2-r1.ebuild b/dev-python/pydns/pydns-3.0.2-r1.ebuild
index 0ba8bd1e41e5..07e0ef210c00 100644
--- a/dev-python/pydns/pydns-3.0.2-r1.ebuild
+++ b/dev-python/pydns/pydns-3.0.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-3.0.2-r1.ebuild,v 1.6 2014/03/03 23:46:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-3.0.2-r1.ebuild,v 1.7 2014/05/03 04:37:10 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3,3_4} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygeocoder/Manifest b/dev-python/pygeocoder/Manifest
index 0d394fbc3fee..5b686fa6bf0d 100644
--- a/dev-python/pygeocoder/Manifest
+++ b/dev-python/pygeocoder/Manifest
@@ -1,2 +1,3 @@
 DIST pygeocoder-1.1.4.tar.gz 8005 SHA256 f85f91a392e8344d9e68debdea14d197b2a7261b7211c4dd2e9674214b5df052 SHA512 b621d768091ca79f3a8fb73006989a5c0947e2c8b9900336585178cb03c73ea15867219b30102dae8bfb197cf7514de304903a5bbe1cc1f3aa5ea6f1efa4ab57 WHIRLPOOL e46dec5871fa6ad6f3107f190afc6eb4b255d33f168d8c1b2c632ac8615c3907d5ed44cf6a1ff2af03001bdf541056b6625695c6d6eb8255c8c9c0f87cc33bc7
 DIST pygeocoder-1.2.1.tar.gz 7571 SHA256 c8ee501d561163a19cd8138efd25d848a65d7c2e57df7e9e733bdf640e75fa8e SHA512 7134e171fdf12a5bf3504dc951b295fdaf11126dcb574d5325c9035d61e7a0cbc8cd9acccc7bf93529bb2a92be846be546858d69087d71575ffbb477bfbbe0bf WHIRLPOOL 66a40c86ad83493cda80e5aac7e8a13d93e5a2ceba335a453914804455fc66e845cf612924b886fcdd634751db58ad61db22988f9eb4e1aff06a9bb4a96c832c
+DIST pygeocoder-1.2.4.tar.gz 8078 SHA256 d3d2b65123135e000fd2999de7ca74839c64cf298e721cbcd67ab42e1435826a SHA512 9faa40b83590ebf642eb0e7cc76edb99ca7c3db91b180a4f1257308fb870edb3e21a9733b38cb8b1dcb3451710e8f42914ec5a7e65443471dc18f1ef1b860908 WHIRLPOOL a832d3ef83a094d45f45ddd39584fad54a87c7efd70a1b108c34ed1744f78aa9996e9008b6b2ca32fb8d573b672456479789f2423edeb7bd93fc1d8252e7380a
diff --git a/dev-python/pygeocoder/pygeocoder-1.2.4.ebuild b/dev-python/pygeocoder/pygeocoder-1.2.4.ebuild
new file mode 100644
index 000000000000..c3c684d20c74
--- /dev/null
+++ b/dev-python/pygeocoder/pygeocoder-1.2.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygeocoder/pygeocoder-1.2.4.ebuild,v 1.1 2014/05/03 08:57:27 patrick Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for Google Geocoding API V3"
+HOMEPAGE="http://code.xster.net/pygeocoder/overview"
+SRC_URI="http://code.xster.net/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/pygments/pygments-1.6_p20140324.ebuild b/dev-python/pygments/pygments-1.6_p20140324.ebuild
index 9c9b18d49afc..cc503b4e70c8 100644
--- a/dev-python/pygments/pygments-1.6_p20140324.ebuild
+++ b/dev-python/pygments/pygments-1.6_p20140324.ebuild
@@ -1,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/pygments/pygments-1.6_p20140324.ebuild,v 1.4 2014/04/25 04:01:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6_p20140324.ebuild,v 1.5 2014/05/04 14:39:11 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 python_compile() {
 	distutils-r1_python_compile
 	if [[ ${EPYTHON} == python3.2 ]]; then
+		# python3.2 does not like u"" literals
 		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
 	fi
 }
diff --git a/dev-python/pyplusplus/files/pyplusplus-1.0.0_p20131206-numpy.patch b/dev-python/pyplusplus/files/pyplusplus-1.0.0_p20131206-numpy.patch
index b511b35aecff..bf33f3810948 100644
--- a/dev-python/pyplusplus/files/pyplusplus-1.0.0_p20131206-numpy.patch
+++ b/dev-python/pyplusplus/files/pyplusplus-1.0.0_p20131206-numpy.patch
@@ -168,7 +168,7 @@ Index: pyplusplus/creators_factory/bpcreator.py
              elif declarations.is_array( self.curr_decl.type ):
 -                wrapper = code_creators.array_mv_wrapper_t( variable=self.curr_decl )
 -                maker = code_creators.array_mv_t( variable=self.curr_decl, wrapper=wrapper )
-+                if declarations.is_fundamental(declarations.array_item_type( self.curr_decl.type )):
++                if declarations.is_arithmetic(declarations.array_item_type( self.curr_decl.type )):
 +                    wrapper = code_creators.array_numpy_wrapper_t( variable=self.curr_decl )
 +                    maker = code_creators.array_numpy_t( variable=self.curr_decl, wrapper=wrapper )
 +                else:
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 8201bb8978a8..61821cedc616 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -7,10 +7,10 @@ DIST pypy-bin-2.0.2-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7754056 SHA256
 DIST pypy-bin-2.0.2-x86+bzip2+jit+ncurses+sse2.tar.xz 9000040 SHA256 cc27253d53cca461e4d4aa8ca3943cae783d4d6389b99d3b7f9f88055d3cf6bf SHA512 90fa4762933a3cbed297a5eb8f1e95fbc70ba02286fc66beb012f27dde1cd06c8eeff0fa2d4a32586d84acbda2608530880d3cc14ea099e3debd239d3c154780 WHIRLPOOL e5a241d3b15aff2bda92f578c2aed7ccc9fbb68f45baaad75eb7229a30dcaabefd6d81cb883f4de7122459a91c521a8c1e6f332500a3f73fa546a42a2e60cfde
 DIST pypy-bin-2.0.2-x86+bzip2+ncurses+sse2.tar.xz 5132392 SHA256 8d434ca55cf969016e0c739b4671b97981f9af36b3937c4f4c1acba4d54df8fc SHA512 cb7ba91f1bb6b67f540e5b573bcc27ae92741407e44e204fb401a6ac38653ecdd2a3084b53216f3ed209279a3d01725d2b7d174e6f7d1038da80d448d40b00f1 WHIRLPOOL d171742333d7209ce2dcd50b0ab8bd2e6382c8bb9f0d7a5d69d2268217afdd155abf5c41a96f9bad18c2606b2f554b7a8ef2f1e943ae41412270582b476cd345
 DIST pypy-bin-2.0.2-x86+bzip2+ncurses.tar.xz 5137536 SHA256 c34e60673346b59022560608f633962dee47d79b96e4015677e86f507ad61248 SHA512 0d737a7d5018d6a4d70d3c0921ed4d8882bce4e6f9ff2b9742ab1763cc760a4ed22fcf683e4e7a1693f35897fa4d20500e6d5a31803e34b15175f4081a2ec6d8 WHIRLPOOL 04de2b1aa32f1a098d38b2b0512822c24385bed9db94f0cad03611a45e189812654f2f33ea6dad1a71a77bab878a8109ddf9c8873dc127a49352adac2a8ff7df
-DIST pypy-bin-2.2.1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9586332 SHA256 7aa7b2b3ee827ac5038d01ae4c56ce458632c83b803755ffbc8d3f7d35bb7f63 SHA512 af82038c90af2b903fc20112744cdb42ab3a5a5b772e386e0e2ad5db39cf0ae58c533a17a81f82c626d7290590489c1aec675fd9a55f2794c6ed81d9e89de0a0 WHIRLPOOL c8775919afdb71334aae3637d68845648b1ea8eafebef9e6dbf0a455b48ced74efba8fcc595c7bdfc6f50292804ea4a469fe8f76a589ff67d032d31f479fac35
-DIST pypy-bin-2.2.1-amd64+bzip2+jit+ncurses.tar.xz 10288584 SHA256 49e84ed919b13c82a0660d7d3f2d45b94e01c81f52d464d04cfdae075bc62d35 SHA512 eaec6b6e2e60d28101864838ecb9a9d09de0de906fbe0e615c07e193b00bbcf90779aec16c67319ea60cf4925023c34c1006800a3ddc48b174747af292050075 WHIRLPOOL 1b08ee890f4e348c30e766be9454d3ee307fac53b94d1f3cf38cf1d33c87ccee5210aa71b7c24d7e04c9d4df09c1242ed856aad357181a70fd49a18a39431b70
-DIST pypy-bin-2.2.1-amd64+bzip2+ncurses.tar.xz 6541964 SHA256 1db7235697c799e6c79a87e9e56ba5c6a95567f6d2b2e5bc120d98acd3d76f1b SHA512 f9fe716cb61487c2b9ab9277f6ce4c8ca31894a30dcd4fb39a093d064dd98ad847b59a175c2fac4c722a8472f0828b96a6210a78c4be010aa8616896cafc6605 WHIRLPOOL 989736d15f0aaba2b5144712aaced67660342565c92db8c73d2981deeb2a6d4fed0abebd639e55575662ea85faf6ca1d362cac447fbc8cd0fff595f167aa7976
-DIST pypy-bin-2.2.1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7755440 SHA256 ecdfd97ff7e6e06fc17453b4edfd425c7213de84f1ee41642603a3852e494c4b SHA512 37ffa4634278d75acafa25c75ddc6dc51f40165424008e964807aced39cd6dd762999008908aa3a4d7fdfdd87a6a964f4442604099d8e8c0f0eb0c177bd6102e WHIRLPOOL cd917f1e47b8db37fef08b9a0daad13e15307275fd863b427bbb3da2500f76210ded7a9a50ee0d30248e12101b9d704a29ec557f4d973530b7b4dc16f57cb27c
-DIST pypy-bin-2.2.1-x86+bzip2+jit+ncurses+sse2.tar.xz 8939780 SHA256 0dc8eaef5e2e4b695da7e4ce9a1791248c749aa8840ace13d50f7bafced34aaa SHA512 46437a077ab398670ddcb942413d6c47c3e09fd0c609e7dddb05f28e36193cdfc789144dd76795379209e801017b458af4e4dea2ee93ac3f3e66ac7f6ca008c3 WHIRLPOOL 354956e331c0d42f84ba687008f992d04802319c73798e5556a8f743b7eda4019c58b195bc7454e78ecea77c4bdef679502ce31c36b0932e3294da5c26ca0fc7
-DIST pypy-bin-2.2.1-x86+bzip2+ncurses+sse2.tar.xz 5170252 SHA256 3617eb9eac5b3b541f928461ba1d6f8e337df5116eec8f874bbbf620057498ac SHA512 3229c02b08c28605f91fb6e48dcf03a11f9968b612e76b067bc02438a5180b2360c07ef9083677ef85053ca0cbfd4bd9f6a42d24fe6ab3e9a77baeda31113ba7 WHIRLPOOL ebf0624fbed59eaef210ee85c492e45c761ac38760554eea23e5286dee3591efeae815d057dd85c9b9b770287eb5c61a9e3ceff031a7d35fa7fa53b7aad1a6a8
-DIST pypy-bin-2.2.1-x86+bzip2+ncurses.tar.xz 5173096 SHA256 ff2dc7d9ff5eb0c5653a46e7c7d0ba6f9e3c66bb3de6d22e65a8ce86519f3ffa SHA512 fe820b7b9b69ad3074cb0c809a52dff092c81d9169c688bc3553830e65bd3a727b180dec4769dc5e0cdc04ec16ce3340b15e6d01a4b0e0d431eb60d2ccd6d618 WHIRLPOOL bc1f8fb5b3970835599ca5858bdfd92fe3b82f898c6a7ac3a72e7a9f8701c1fb339a73edb92c97bfcda7333cd54b9b8387944a506ad9e769fbd703a760d9f517
+DIST pypy-bin-2.2.1-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9607224 SHA256 458c2d76d86998db9fd3bfb910bdbab87251ae658f52a916baeefeeaa62d0f67 SHA512 5ec70946ff0c7664bacdcb5a03456a1cb3ba56bba80e1781b0544eeae1626329523200e31ea449c58833c0288841b4016e375a9e4cd2035b4dc4f71b0de31187 WHIRLPOOL 156edb8f57e9dbe8e5d2995a6dcff82ea9da38537afbb79fff99cc762f6b2aae3090cff0105b06accb857a5702fc4f3efee33e56a58f378c2773cd8338613c7b
+DIST pypy-bin-2.2.1-r1-amd64+bzip2+jit+ncurses.tar.xz 10297432 SHA256 83ee64cb1ea2a333bbcc4ae46078940eba5444790b994e021746d82a65984c6a SHA512 cad7056b41db3bd1f1ee4028c89953ae7cdecdb2f6dd8c58d2f5d86b67e27bc472575dac332b55946efa755216fed7bce457e773c6f992adefcf5225ea3dcaff WHIRLPOOL e63197858bd97a69f3224b65794963291393d7064f22b025954681df412ecce3d8b157eb65fc1bc3e4a85fb4c4d9b4ea45c6804c907468ae20f1f13ac028fa5b
+DIST pypy-bin-2.2.1-r1-amd64+bzip2+ncurses.tar.xz 6493176 SHA256 ad0c6befaad066082dc19f833981c6136fca27d7e803b2de6e7b7cb237b831e7 SHA512 331d7bb36afd400af0824c71825fccec7bc3f9b3e8131443ece7d654e5897930d278f4e6be71a034794ec96cc3217f017237df09c7113f23a3994582f9ffef1f WHIRLPOOL 0eab078d234bc91d94c926c57b85c8f7ac5cda7fce54ccd77830b27d3681df8ac323f29f089dfa0334b909a89ff627fa4381d5b751b8c8cfb0e11700d58683a0
+DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7789720 SHA256 f3538c4f4496cce6199b155e384e50dd43a174416a2399220e7ab8634ec7bfe0 SHA512 2e294241bc7fd00486d999ffd5349c5c7a5debf8e24f0411dec4901cb8e5ab4edfc822591f68182df7fb9fed2505a3a0aed0248584ee2a4d327332f610f88564 WHIRLPOOL c4220cf9e8bc09898a268e007ccd08a89d2e54b3b0174ab7c6961de32039ebc8df6e5b3a0b47dcabb82d4e2c9669ddc72808b3a9f4802671861593aba26e18ea
+DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 8981480 SHA256 e965e343bf5e43c2f21e1bb9317a22f06ebc07c57127ffdb6ed5a9768a834e0e SHA512 1731aa4db600fb5cf79f17607a0e68321c5be5d969acafa249708e9b91a3f4b5fcde96a64c85f2fbd8977ccae288e3e9b31531dbdf090bc816a783c06b983b5b WHIRLPOOL ed03fbe804127b33b853df19a7462b40931826cb906e60f645737bc7df17870132e8a68bfbe55e6c7a79fc971e2c93e63e6e897da6ff29da0aa1c0998c848f51
+DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5179532 SHA256 2cc4e6208303ed64a09e9769a866523217dadfb81322ea0dc931e6d4f2cd757c SHA512 3bd1b3a45c60461294eee63d25f4f71c93289d5aa18193585a478dae343fd2930cf3f2ce0ef001fa33b3a6c77abc26842e4941f0573ed163c8a60feb0fe6ff51 WHIRLPOOL 536a6dfbc6f11fb8e3d3f3fab232263e4731ec97cc3eca4c952042c747b30f761821bc4ddf7c7e896d9692d555a5b5fcb6057f3c3c31e8f8cd6bc9edbbd88503
+DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses.tar.xz 5179732 SHA256 2889b1b3e0af8d7a763f9d237295ab181c9661c0f57d26e799c71d28df388714 SHA512 ce34e0cb0d362381ce6ba8fab84a55463d2c4cc0834df550e0823b6ec97d762386d382ba1a7a5e039ef531070bfa27ed76c88326a48f948cb9f82af78fda2391 WHIRLPOOL e6cc06898e967010d30d225a4ca59b70080da3763e0ad153211719bc99fd707ac8ee8d28ee2c286f87404439424ab59ecf7332162658f0b4cb0a3efbac35f54c
diff --git a/dev-python/pypy-bin/pypy-bin-2.2.1.ebuild b/dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild
similarity index 90%
rename from dev-python/pypy-bin/pypy-bin-2.2.1.ebuild
rename to dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild
index 79e029227dcf..78be0175e9b0 100644
--- a/dev-python/pypy-bin/pypy-bin-2.2.1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.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/dev-python/pypy-bin/pypy-bin-2.2.1.ebuild,v 1.4 2014/04/21 11:18:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild,v 1.1 2014/05/03 18:00:20 mgorny Exp $
 
 EAPI=5
 
@@ -15,29 +15,36 @@ SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 	amd64? (
 		jit? ( shadowstack? (
 			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
+				-> ${P}-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
 		) )
 		jit? ( !shadowstack? (
 			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
+				-> ${P}-r1-amd64+bzip2+jit+ncurses.tar.xz
 		) )
 		!jit? ( !shadowstack? (
 			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
+				-> ${P}-r1-amd64+bzip2+ncurses.tar.xz
 		) )
 	)
 	x86? (
 		sse2? (
 			jit? ( shadowstack? (
 				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
+					-> ${P}-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
 			) )
 			jit? ( !shadowstack? (
 				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
+					-> ${P}-r1-x86+bzip2+jit+ncurses+sse2.tar.xz
 			) )
 			!jit? ( !shadowstack? (
 				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
+					-> ${P}-r1-x86+bzip2+ncurses+sse2.tar.xz
 			) )
 		)
 		!sse2? (
 			!jit? ( !shadowstack? (
 				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
+					-> ${P}-r1-x86+bzip2+ncurses.tar.xz
 			) )
 		)
 	)"
@@ -61,7 +68,7 @@ RDEPEND="
 		>=dev-libs/openssl-1.0.1c:0 )
 	( <sys-libs/glibc-2.20:2.2
 		>=sys-libs/glibc-2.15:2.2 )
-	~sys-libs/ncurses-5.9:5[tinfo]
+	~sys-libs/ncurses-5.9:5
 	( <sys-libs/zlib-1.2.9:0
 		>=sys-libs/zlib-1.2.7:0 )
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/dev-python/pyramid/Manifest b/dev-python/pyramid/Manifest
index 67cfdd3ce970..2161400330e5 100644
--- a/dev-python/pyramid/Manifest
+++ b/dev-python/pyramid/Manifest
@@ -1 +1,2 @@
 DIST pyramid-1.4.3.tar.gz 2426125 SHA256 8484ceb740ae5e21bda40fa9f9a8fd3be2cdd323eb64ff7e21c0bf3b6388c5b7 SHA512 c892b261e6f866e369cf1327a084436554dd13989fbf96828c1db166cf3abe1a49c3be0c242cd59a6b97bc11291a6ec6864290c031cfa43f694b7f9577461aa5 WHIRLPOOL d6fd2e7af36ce7cb241f349590b9a8df82e7be4da72575397b2b5f33e38171a23a9741de87dad7bc2dd9acfb2510a67dae397b67534e8285909b989bf0c5d6cf
+DIST pyramid-1.5.tar.gz 2413504 SHA256 db3216f61d9dbb5358fcb3f9eb2d772948c5b2bc608eb2f643159b4abd993621 SHA512 158617587cacd1c660e97d65a92739a4b04c795f1bc08db6afea574a603fcbca7aa69f0389000ed1e69a067a9007a63996c273843a4e5b7e6135d9d46a283cd9 WHIRLPOOL 46c284cbbf3e94af1ff8c26651ea773558a1791436387a6f515ae4b82013f7764159ffa2d9f24d3502536993bd4caa54b79328f85afd90bfb5c507f15f086de7
diff --git a/dev-python/pyramid/pyramid-1.5.ebuild b/dev-python/pyramid/pyramid-1.5.ebuild
new file mode 100644
index 000000000000..5bd8cb6c8d1f
--- /dev/null
+++ b/dev-python/pyramid/pyramid-1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyramid/pyramid-1.5.ebuild,v 1.1 2014/05/03 09:47:32 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+RESTRICT="test" # Can't package dependencies
+
+DESCRIPTION="A small open source Python web framework."
+HOMEPAGE="http://www.pylonsproject.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+#IUSE="test"
+# tests would pull in net-zope/zope-deprecation with its deps - not a good idea
+
+RDEPEND="
+	dev-python/chameleon[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/repoze-lru[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	net-zope/zope-interface[${PYTHON_USEDEP}]
+	dev-python/translationstring[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/venusian[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+	#test? ( dev-python/webtest[${PYTHON_USEDEP}]
+	#	dev-python/nose[${PYTHON_USEDEP}]
+	#	dev-python/coverage[${PYTHON_USEDEP}]
+	#	dev-python/virtualenv[${PYTHON_USEDEP}]
+	#	)
+	#"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index 560ed364d724..da2b59eb23b2 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -2,3 +2,4 @@ DIST pyspf-2.0.5.tar.gz 38818 SHA256 a9e143fefc6bafd9f6e39b1b62eaaafae8bf96bdc25
 DIST pyspf-2.0.6.tar.gz 43448 SHA256 ed20f35d8c1d60516b195ec08ce7c8479d450be28fd37baaab58dbf570ceb429 SHA512 fd39937ac0da6e9ea34bb3cdd10c33d43d676718ef790752dca21fa1bb94dafcc861e3dfc2c22df28fdef86d361d68f5a2eecc4fa1b2a28fc2532da81cebcd05 WHIRLPOOL 5dd92947c636eb03e8e2fec0dfac99738aee4fa4c6a4db859abbc7290ea9b15469048d942d2f732e743fff3f65842145555068a319e744a45162d837d9d53e86
 DIST pyspf-2.0.7.tar.gz 46283 SHA256 d26355f2576ed345971b88bec7a97795112476d022d10b943d8580c3f78b44db SHA512 879bff1904fe189ba1c01f10008f978413d5fcb52a564de6a028bb308985e099362a63c99a8a789b3406b925ab5aa1f911ea5a5bb23df593e0d891d8afda9877 WHIRLPOOL b958fd1318938364a8677948ab644d81dc36befd728496380bdbf49238d6fe53f551af633f2ab73ada829bbd6ccf804e175c513a374a53606669ca280b0ed1a7
 DIST pyspf-2.0.8.tar.gz 48818 SHA256 b9ff846a7b6c883383451d1d4be526762f1d88de84e89d6de05f73f51c2c3dcf SHA512 2ec54866d1233e7922838b4f62508c02641ad3f6b2ddaadea3bfd848f880b8e8e6cf07db24c961fdabe1f5034a0ff0e691bb526a1c0a4698599e11ab268b3c68 WHIRLPOOL 1ef445386214e4539b12cc805445049a04e8327af6ae4ea32ac1d6e7dfd979a64a0effe1f10bd4b9d866602d74347b04e39532e08fe13acd10928d13a5b58291
+DIST pyspf-2.0.9.tar.gz 63537 SHA256 e4828f785c935d5d24dcab1e8abe13b57de965219c8e821222e763a27fd423e0 SHA512 af305c3e3a5f4d121bcd07d598e91359c6b9e93c8edd3ca6091c07be961478bb9848ac4942cc60dafe7277bc96ebeaa004d6a48a10f03bbeb36760473928c224 WHIRLPOOL 6319e409c69ef98841b4e0c2c916b644de99224f164c1bed4ddf13c962e2c355c9e4d51c4cce912cf8995a388813adc4de32b77cb21a943c876df684a8acca5a
diff --git a/dev-python/pyspf/pyspf-2.0.9.ebuild b/dev-python/pyspf/pyspf-2.0.9.ebuild
new file mode 100644
index 000000000000..1e942ccd268b
--- /dev/null
+++ b/dev-python/pyspf/pyspf-2.0.9.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-python/pyspf/pyspf-2.0.9.ebuild,v 1.1 2014/05/03 05:58:57 idella4 Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="ipv6?"
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
+HOMEPAGE="http://pypi.python.org/pypi/pyspf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 test"
+
+# >=python-3.3 comes with the built-in ipaddress module
+RDEPEND="dev-python/authres[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pydns:3[${PYTHON_USEDEP}]' 'python3*')"
+
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="test? ( ipv6 )"
+
+python_test() {
+	pushd test &> /dev/null
+	"${PYTHON}" testspf.py || die
+	popd &> /dev/null
+}
diff --git a/dev-python/python-bibtex/Manifest b/dev-python/python-bibtex/Manifest
index ef710d24790d..309edd9ee620 100644
--- a/dev-python/python-bibtex/Manifest
+++ b/dev-python/python-bibtex/Manifest
@@ -1,2 +1,3 @@
 DIST python-bibtex-1.2.4.tar.gz 57057 SHA256 0df2e9cec2219aa08133972956d97eb9d641ac2e1e6a115fdded122ae18a1f7a SHA512 49020be898475a6fbdb233bbb673728075c310c27ae4f6fe7aeaab2128cf036228f50df297af76158f57df94043025b710ca4a7ebb9051ac1c4dbde04e372497 WHIRLPOOL 12ece30f10774dafb5265cd0fe55f90fbfea22a984300cdf2c175d8f750882da5d3c2a0435d47c1feb728693cda30a8e4216b12c82dc92a7435358bc124854e8
 DIST python-bibtex-1.2.5.tar.gz 59588 SHA256 59641db49689c5ae8dd4244e2d900a436e426d0f9b74c2512d11a00e40cfdd72 SHA512 b0ed2fecd420310f3bd8f0223ac3649125519b8715be36ed7a709750f947397f332d456590e8623335aac60d1f507c52789a861963947644e004be537b02bcc6 WHIRLPOOL 8cee754e5b91e8c9176c8a5f8646ae05f9bc5bafa56275e6abf19442f2a7ea450435f4c11a355ba108ad6ef3ae2119534596c9834553627b3ec421776eadba40
+DIST python-bibtex-1.2.7.tar.gz 60894 SHA256 37709a19b94858def4ede028e670b14153f98c62c6adc926af8102a3279eeaf0 SHA512 6739824fcdad91e2abb333d9e17a31bd222e6100630b8e4f65a9e718d36eb451600fdc7380cb63b89c4a33a7554b79dd1c52448d19c3359f21deee2134242e6b WHIRLPOOL 9c067e05473da5ec7ac5b6a0e5e5dc1363326aeff38946bef33858df8cc324079bf82bed59c5a7642310b749fcd9a8b62f341256373fcefe6919d54dae1fd034
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.7.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.7.ebuild
new file mode 100644
index 000000000000..3c73f2340fc4
--- /dev/null
+++ b/dev-python/python-bibtex/python-bibtex-1.2.7.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-python/python-bibtex/python-bibtex-1.2.7.ebuild,v 1.1 2014/05/03 09:15:14 patrick Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils
+
+DESCRIPTION="A Python extension to parse BibTeX files"
+HOMEPAGE="http://pybliographer.org/"
+SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=app-text/recode-3.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Disable tests during installation.
+	sed -e "/self.run_command ('check')/d" -i setup.py
+}
+
+src_test() {
+	testing() {
+		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" check
+	}
+	python_execute_function testing
+}
diff --git a/dev-python/python-caja/python-caja-1.6.1.ebuild b/dev-python/python-caja/python-caja-1.6.1.ebuild
index 5ab2ed21a80e..699061347b79 100644
--- a/dev-python/python-caja/python-caja-1.6.1.ebuild
+++ b/dev-python/python-caja/python-caja-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/python-caja/python-caja-1.6.1.ebuild,v 1.2 2014/04/26 08:21:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-caja/python-caja-1.6.1.ebuild,v 1.3 2014/05/04 14:53:18 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="doc"
 
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index 1fca5683a5c6..a7331ed17144 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -1,2 +1,3 @@
 DIST python-sqlparse-0.1.10.tar.gz 151351 SHA256 8bac29a6e21ed64ec69703971cd9ac0fa50e7e01f62a6d826fd2ce76f3191199 SHA512 8b30ac752f0208d8247b353d71e56e67a6a874384999ce35e4391f4a8a8919e8c59fa1d3bb53cf676164fb3a677fc4791fd57330ff52613fc8d2f6e85d8b528b WHIRLPOOL c31f024bf04985054a8efabe80c05e15f8caed7188a73a5749c3e1150711a504bff111b4d3504118e455e358cead8cde5e7a0cf480a7cf0b7ea70a1312b7b6c7
+DIST python-sqlparse-0.1.11.tar.gz 151998 SHA256 14154a32b3e3b409641b2d3f24bd0ae8e86b481f0773dcd0a864bb74631a2b57 SHA512 e16b1bb2e1a0492210e38d6200c43325387ad13ef91f23c334b1476d0b20e4265e9cfa3ddfcbef56eacd926347541774e7ca6fe8055fccd63b1e5a8625fa1c18 WHIRLPOOL 224b2eac573fb4b02a6248029e733ce7d774044e551c106456ad2e8c32e1ce4d5a98119186aad912dd347b279cbcf96794d029360be50acb27e7fa0585610836
 DIST sqlparse-0.1.5.tar.gz 46138 SHA256 dfbbbf50e86147ea2a2f32c2c4bc0743faec1edd02d3201b4e9a32ffa41e00a7 SHA512 9bccf67e53c8c40bc315d8998db00cb70dd145698313196287c31be321a6fc96f8ac44fb74ee581e87e8b9af484354019fb6296d750ac9efd080ddc55c6cb4f5 WHIRLPOOL 89c595569bec70c7cc561d193acb38048ed8c22abeb42cbc8bacbb832a3aef6b20845d2c499afd04c75574fa4016e10242a966481b1c55a455d32997098ed819
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.10.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.10.ebuild
index 493794a15e8f..939c31502f0a 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.1.10.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-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/python-sqlparse/python-sqlparse-0.1.10.ebuild,v 1.3 2014/04/27 20:57:01 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-sqlparse/python-sqlparse-0.1.10.ebuild,v 1.4 2014/05/04 08:24:47 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://code.google.com/p/python-sqlparse/ https://github.com/andialbre
 SRC_URI="https://github.com/andialbrecht/sqlparse/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="test"
 
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.11.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.11.ebuild
new file mode 100644
index 000000000000..a3c101efdc8a
--- /dev/null
+++ b/dev-python/python-sqlparse/python-sqlparse-0.1.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-sqlparse/python-sqlparse-0.1.11.ebuild,v 1.1 2014/05/03 06:43:54 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="http://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse"
+SRC_URI="https://github.com/andialbrecht/sqlparse/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+DISTUTILS_IN_SOURCE_BUILD=1	# Required for running tests
+
+S="${WORKDIR}"/${P#python-}
+
+python_test() {
+	if python_is_python3; then
+		2to3 -w --no-diffs -n tests/ sqlparse/
+		py.test ./tests || die "testsuite failed ${EPYTHON}"
+	else
+		py.test tests || die "testsuite failed under ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 816e8bcf1437..94011edd4801 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1 +1,2 @@
 DIST PyX-0.12.1.tar.gz 561989 SHA256 e837b26a8b1c27524cf3f3dd6c0d563451249159edaa2e366d87e7143a867e8e SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1 WHIRLPOOL a4d4a21e78b72841ca38dea87296d21f0bc8255e428cb0733fbee9d71c3bfb031d8a9f9fff988dbf0e2af7222553918a9aa924769891c50beb607c6ce3fe2fa4
+DIST PyX-0.13.tar.gz 1237082 SHA256 1952962c965000d8e04a00d1b85c600cdef4588cea88c9face2adbedf21d42c6 SHA512 cab0c22f0862ae20cff92504ededf4fcf5820d5773130fb258de1a95d295ca4fe657b85d5ccd52021a4f84403e6db8eebe9f676fa405781738502456123eb05c WHIRLPOOL 0a6159cd5f2683c70b33aac71278ad6f0df3ae54897d0ab31a9b61897be9b4e531cc41c7772a60a152b3b7a39d383ba669be7401c503704f14cbbf3ceca25c41
diff --git a/dev-python/pyx/pyx-0.13.ebuild b/dev-python/pyx/pyx-0.13.ebuild
new file mode 100644
index 000000000000..6a48d4ed7576
--- /dev/null
+++ b/dev-python/pyx/pyx-0.13.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.13.ebuild,v 1.1 2014/05/03 08:07:26 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python3_3 )
+
+inherit distutils-r1
+
+MY_P="${P/pyx/PyX}"
+
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="http://pyx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="virtual/tex-base"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CHANGES )
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+}
+
+python_compile_all() {
+	if use doc; then
+		cd "${S}/faq"
+		VARTEXFONTS="${T}"/fonts make latexpdf
+	fi
+}
+
+python_install_all() {
+	use doc && dodoc faq/_build/latex/pyxfaq.pdf
+}
diff --git a/dev-python/pyyaml/pyyaml-3.10-r1.ebuild b/dev-python/pyyaml/pyyaml-3.10-r1.ebuild
index ea7f7b489778..b87cfb89df61 100644
--- a/dev-python/pyyaml/pyyaml-3.10-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.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-python/pyyaml/pyyaml-3.10-r1.ebuild,v 1.6 2014/05/02 10:18:09 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.10-r1.ebuild,v 1.8 2014/05/03 21:19:27 zlogene Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -15,7 +15,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_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 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index b139b3a3a0a6..44cd3baeb7bb 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -2,3 +2,4 @@ DIST Scrapy-0.14.4.tar.gz 726253 SHA256 8de12ac37136524ad2fb0d83db10736b03b1d445
 DIST Scrapy-0.16.4.tar.gz 679384 SHA256 cc70a8a803c5c086956f42aeda49f9780980c89078438afe606c63e39cf19c46 SHA512 9212c6da0debb97ffa59f965da1d5eb3396c1dd6fcef9fc790d3ae2737e1a6f75f00dd488983b0ffbbad5bcc87b16593cb3524b60bc71a7e0431eb6e3076e7ca WHIRLPOOL bc64bb42e2b51ebbd0c2eb8bcae9c7695aead180f8ac615f0d21798380ad2ac1552179369d2df5c3fd8ad7b9b514cd2643625226094bb18ec4b897f572454741
 DIST scrapy-0.17.0.tar.gz 881738 SHA256 fa4c827ba005bd2e90387f4c68056e7e64397b09ef3ac608ca43abee21268387 SHA512 119b88f5ccd96ee626c6b5ef6a75bafd2e41337ec59f0df10f31318671e9534751c11409262af8e1ab02d33b0e48d0b371eb78cab88279865d001fae8756ada8 WHIRLPOOL 1ac38c09476ab643ae6af7976b5cb9797df5f3f0be9197fc8ad754159dc8b6b9be70a0f9a2ece4d4dc350f3051d6871ab505973692aea5a9733547aadd474623
 DIST scrapy-0.18.0.tar.gz 940372 SHA256 4c1fa8c3190cae8ed2bd55e928dbeef7f09f4a349913f29bd1caf14fce67b1ca SHA512 229b3f90ea46dece2ca11159e11713ab2fd2bd9c29303e59c26273c1ba9f8da1aaeb981b7b0c2d949f147b7a8d9e9cb75eebf5391de76ef4e4fc5422ed49d4f6 WHIRLPOOL fc66f2571885b2c19aadb1b19dc6ddd8917ceeea779f82595ec233f1f74fac77462e038d9d21b4849c2a12460f9e30d61e91d464e61011285e046afdc64b6c93
+DIST scrapy-0.18.1.tar.gz 941931 SHA256 8bc66519d19c12bc8446273845a6bd26b690a1b8ffcae2db801835b960001690 SHA512 a4a34d212882a4434316b50afa07679f69bc5d6615acc172afe53d6d3a2359ca12ed6e34a9a0ef79f0862bc30108e3f82193cabff36a57feafacfc5fe41989ca WHIRLPOOL dcceea31ea4e96c61c064b2e7425665c94a04b81dabcb25e850553bef63eed930d909f4c2f2d18bb45c550efcb76d69b93a16951f928ffbcea00e3a1fd53aac6
diff --git a/dev-python/scrapy/scrapy-0.18.1.ebuild b/dev-python/scrapy/scrapy-0.18.1.ebuild
new file mode 100644
index 000000000000..ee09e741b633
--- /dev/null
+++ b/dev-python/scrapy/scrapy-0.18.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.18.1.ebuild,v 1.1 2014/05/03 07:34:51 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="A high-level Python Screen Scraping framework"
+HOMEPAGE="http://scrapy.org http://pypi.python.org/pypi/Scrapy/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boto doc examples ibl test ssl"
+PYTHON_MODNAME="scrapy scrapyd"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/boto[${PYTHON_USEDEP}]
+		dev-python/queuelib[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		net-ftp/vsftpd
+	)"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	boto? ( dev-python/boto[${PYTHON_USEDEP}] )
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/twisted-core
+	dev-python/twisted-conch
+	dev-python/twisted-mail
+	dev-python/twisted-web
+	>=dev-python/w3lib-1.1[${PYTHON_USEDEP}]
+	"
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		emake -C docs html || die "emake html failed"
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${PWD}" bin/runtests.sh || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	if use doc; then
+		dohtml -r "${S}"/docs/build/html/
+	fi
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r "${S}"/examples/*
+	fi
+}
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 2045d5e91802..1287b56ce5cc 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,3 +1,4 @@
 DIST serpent-1.2.tar.gz 7878 SHA256 e233c7526715d08c3ef0a872f6f3e5a44097f58a557f635af67c91246d5c9841 SHA512 5581179c53fa427b6fd37c593234c1b2473632cb475994ea893327e4b8a64f324fba2d638dfdee5df877e3b7d78784e1406ba22f99d777b480fd31b70bd9fa5f WHIRLPOOL 75160c0532013a02eb5ccdf59afc77929c9a873a50cbe7ae36f8e574a61c892c2a9b545cc4622213a67888771be1d9da8debeb9eb68bf467dac7c1d6df87813a
 DIST serpent-1.3.tar.gz 7896 SHA256 45560ada9e07e1400304870210c64c2de14ab414e23ec7a1271d673fa92104e2 SHA512 ce0c9ef98b437322ecca2b0bca91fd67ccb6866cd35dde5f7e3c3d7ea2fccf85431efe3e0ab76f57c65c9d1b9321fc8deeab7c12e27f5b3a0d559793134e4f99 WHIRLPOOL 78393b435f41b0e1d04664f6a96a4134cbf0b1f63ffe5cbc598b1e1da7e52ef8ca2ff95bbf2d52baa4f52d711b95dd5ef3d56d1a2ff5b2f6cbb5ccbe0402ab5e
 DIST serpent-1.4.tar.gz 7988 SHA256 dc95871fcf3c11446dc42049c4941f38c6cb67d85e9207d3dcd4b904a59805f0 SHA512 2d50a77a73f9191642269cf629665ca5c035dcf639c3892cfdeb120ef7f6f78076d0d34effc0d989b3f8b0aaab12f5d43785743c0d64d8c6d06534ea71ac0771 WHIRLPOOL 86a3220711989589ebbedd91223e5fab24bbd1b7cf8e36d8810a5eb4e26e15bf57da1bc105174d8cbbd1581b1fc173e83506540a795ce6bfba73f07faa5a85e7
+DIST serpent-1.5.tar.gz 8465 SHA256 c9202089dc07b66ec5a5bca33eb5b745e5caf19b6909185b88439daa4d5840f8 SHA512 71df24f3a144413a3883898d86a377930256fbd903d3862ea400fa8360a22cc28c8589146a68cc74c60451b164b8bf9f240336dea5e2844203e4ed42f3522713 WHIRLPOOL 33c8019c2980d24523ab3bd78005b9fc67d51b3fe406071213e1b2b32d2c5d8608d3cd8754b9cb13e3c859d5537907a7fcf0f080bb162ba03b9f4fbf8a3f241a
diff --git a/dev-python/serpent/serpent-1.5.ebuild b/dev-python/serpent/serpent-1.5.ebuild
new file mode 100644
index 000000000000..e25da61c92ca
--- /dev/null
+++ b/dev-python/serpent/serpent-1.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/serpent/serpent-1.5.ebuild,v 1.1 2014/05/03 09:25:23 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple serialization library based on ast.literal_eval"
+HOMEPAGE="https://pypi.python.org/packages/source/s/serpent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
diff --git a/dev-python/testify/Manifest b/dev-python/testify/Manifest
index 4814b82a7aa5..c2b0ebc4174c 100644
--- a/dev-python/testify/Manifest
+++ b/dev-python/testify/Manifest
@@ -3,3 +3,4 @@ DIST testify-0.2.6.tar.gz 47408 SHA256 2022434f032e1c354bc3e224fd20781a48df1bfb0
 DIST testify-0.2.7.tar.gz 48814 SHA256 abfd329de7d0146f1bc5706028ddf8c58c8334b7bab94fd60daec6a3e02cff73 SHA512 5ef77f2d7050f0ebab35aaf83d93b3daae2fcfa6eed4eb31fe7635ff2450ab731452fec2c286d6c58375021d3231d73c55b05be42fc2e11bb35022a5e6fa1373 WHIRLPOOL 2aab37fdc3d5f9587162fc1b8cfa03be819d965aa888aadba6a2646807bb4bc7dc2392131d86f6832cba4aca84eff961b503d25f314956dded5520179c94ba0b
 DIST testify-0.2.8.tar.gz 52223 SHA256 703642f3f6e6f3913a2b10d5c508476e4428176be827ce66cbdb30d57cbd4edf SHA512 55ccf33020518a666e3864efcfb09475926fa0100e2b22b49627d7e3919a0b79cab847aa358238f039cf1fc51c22748bbe3ee8e750af9354a0ca4a87af11e89f WHIRLPOOL 0ce663793eea109bcf02cd6141d2765a71844d842855b9decf13f5dc5d30f25c2ab644499b83e15cdcb514fe188c9f5620cccb0a1c08808ce02f5a7c6c17d3b6
 DIST testify-0.2.9.tar.gz 53142 SHA256 d7ce5b96fd30b143c98cbd3bc4ee51154e4a24fce5157adb7edc8e3144507dc5 SHA512 3fcf6cfbb7730ab322091d3042bab916148388be61f517e108547b0927bc0f40435c11015af763097cc91dc6c7ba942f5a308ccd0ab1cfffc34358d0034a97a7 WHIRLPOOL 3352a4bac0810ec7898e86a9d125dca91fd74d8ab26b6d63c74c8ac95cf3549f9b649223da1c0efd57f2d69bda6b7f8e758b3107867b03930fcac773d8085808
+DIST testify-0.3.0.tar.gz 57882 SHA256 1182efebb3e9ff6c46ea4fe9761b732282bb3557099cc780cc3d4de64d6407e7 SHA512 36e5f8aff152ac9aa3bc98e5e615b9605cdff53d4aa977960025cc633dde6514dec3efa0d581b5ed2b8e852539a0935a82529423754a54bc987b75ef7fb624c3 WHIRLPOOL 2a728f534dd00d72ea8a691e540846c49bf7bcc0978043099ff6776aa233597148ad9b58abb52aa6ac02af20e41be0bc774a6ff4223269b7b379c710e5e6f42e
diff --git a/dev-python/testify/testify-0.3.0.ebuild b/dev-python/testify/testify-0.3.0.ebuild
new file mode 100644
index 000000000000..37f59d971106
--- /dev/null
+++ b/dev-python/testify/testify-0.3.0.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/dev-python/testify/testify-0.3.0.ebuild,v 1.1 2014/05/03 08:12:00 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="A more pythonic replacement for the unittest module and nose"
+HOMEPAGE="https://github.com/Yelp/testify http://pypi.python.org/pypi/testify/"
+SRC_URI="https://github.com/Yelp/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy
+	www-servers/tornado[${PYTHON_USEDEP}]
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+DOCS="README.md"
+
+src_prepare_all() {
+	# Rm rogue test, Bug #438032
+	rm -f test/plugins//http_reporter_test.py
+}
+
+python_test() {
+	 "${PYTHON}" bin/${PN} test || die
+}
diff --git a/dev-python/testscenarios/testscenarios-0.4-r4.ebuild b/dev-python/testscenarios/testscenarios-0.4-r4.ebuild
index c10f2f30e104..9f4df7767891 100644
--- a/dev-python/testscenarios/testscenarios-0.4-r4.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testscenarios/testscenarios-0.4-r4.ebuild,v 1.5 2014/04/02 12:52:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testscenarios/testscenarios-0.4-r4.ebuild,v 1.6 2014/05/03 14:12:40 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy2_0 pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index df3dd4882c9a..e8b93aab3c02 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,3 +1,4 @@
 DIST testtools-0.9.15.tar.gz 152830 SHA256 49ef090f09e217c9f2688d4b2f9e246f00b9c1a867040a7ae8e4e9de7f707c02 SHA512 164ffdad57ad3f0dd3c64dc29b67a21ee5721316dd7c71027b018c51f3dfc49ed9fe3b1fb6a2c4fcb796209a783af07c8e7ca9847bfefb8e5f8729ffa6190eb5 WHIRLPOOL 60d7810db7d69054a33cd7d16861b7860ff8d308eb6bf88b9a3116b5dff9395e4a0b171a064745eafcfa9b9f9dbd745a9265e5d533de868ef8398c14778aee6f
 DIST testtools-0.9.24.tar.gz 162842 SHA256 a7072188727d4cefacd06bc6d87b845805300ba5d58a6fa92583abc04edbf355 SHA512 d03e822b0e0c1f75a14873f9e959774b23515f48c1ad0216e40022f2e43ecc6b61c355fd08b139e5293d3db52b2583d77600be3274dbfb0d8d0960632ed68c52 WHIRLPOOL 8461efec27a1f85282d6a1cfe024388fb084aa3d7339d9d51d3783ae3317715ce6674df1c3914546e569e84087376ab0436e2f265dcd0e458a8e818cc22aa5aa
 DIST testtools-0.9.34.tar.gz 195771 SHA256 96c5a7b51690bfe3a2610b13279644780a617a39c879a513132e362360b2da68 SHA512 802dc8a9a3549f9cf0eb20befb5cb5a1f12defb9edb013d3a99eadbe3f025030f7547f495242066aa3ba5776409e984e5ba3de61a4a23810109e288a819885f1 WHIRLPOOL fdd5e1a8fed7826d8e04d3c52bdc20edf157d1e00f269bb0ded0bee9545fcc52d4c924f870ca4069912f281e27f8345cd5e5f53222d6faaa3cf8619a03b03381
+DIST testtools-0.9.35.tar.gz 195677 SHA256 9a9ad71aa9b439a389a70568c2947a4350c64bbbb5e3249bf6c0b844a6f93854 SHA512 06efdb87263f551fb2b9301b28522157afa36bc40136e15c33984ff5c52bf70d39f19bc17dbfa96bf08095a7f0879f2e9f4837db7c2d57718fd687778bcd7b79 WHIRLPOOL 8f951d2c92d2e819ee3fc4c3e3443c17f58f513143e85281daaf807a646027b0918a708b2b76a892a2ae01a8026e2ff3380749d6ae8b5276793c09dc623fb85c
diff --git a/dev-python/testtools/testtools-0.9.35.ebuild b/dev-python/testtools/testtools-0.9.35.ebuild
new file mode 100644
index 000000000000..8367c537ff15
--- /dev/null
+++ b/dev-python/testtools/testtools-0.9.35.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-python/testtools/testtools-0.9.35.ebuild,v 1.1 2014/05/04 05:33:06 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} pypy )
+
+inherit distutils-r1 versionator
+
+#SERIES="$(get_version_component_range 1-2)"
+SERIES="trunk"
+
+DESCRIPTION="Extensions to the Python unittest library"
+HOMEPAGE="https://launchpad.net/testtools http://pypi.python.org/pypi/testtools"
+SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
+		dev-python/extras[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+
+python_test() {
+	# https://bugs.launchpad.net/testtools/+bug/1191725
+	# https://bugs.launchpad.net/testtools/+bug/1191725
+	# These tests pass run from the source, a gentooism
+	if ! python_is_python3; then
+		sed -e s':test_deferredruntest:#&:g' \
+		-e s':test_spinner:#&:g' \
+		-i ${PN}/tests/__init__.py || die
+	fi
+	# Bug 509510 re python-2.7.6
+	esetup.py test
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index f29ae0d43cc9..4467bfb1dafc 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,4 @@
 DIST tox-1.4.3.tar.gz 71661 SHA256 b998d809d954fd9c30476a56bbbbf20a1a5adaa3e4cc5eb052c7051a682b2021 SHA512 4d7359c8f3d9d6f7c71dbd7d486221eed24b60ccf5de561c558e877ebef69186ed1d4829ef50e5d1d50ae20907aae350ef85748b2ecf4187247fe9623baa54f6 WHIRLPOOL 0a0e715a3dd6f846d0737d29e8a17f1cadc83c6eff72efaa31fd61fe96800b910a8d833b2fc8526643137ef60ffc5bd8833f0fdee59fc2785ac2de38fff118b9
 DIST tox-1.6.1.tar.gz 131654 SHA256 05c72b3b7481b47f48f63436c7355783dc8be77ffd7c2bc948b0b7aa2dd4d0de SHA512 af5e26e1b1a1f62b528063e540424087f99ef467e3b9aae27e6658170218f010cba9af544b42776025d5058ebbaec81cab81eed0a0d67129237635a3905abd10 WHIRLPOOL 219174233cd9a22ba971d85d76b8395b090055fe9f105c92a946add03b0e2dbc43a5c249d669911ac7ec018cea58c3f8d76501ecee6962dd5a9a6cda57033447
 DIST tox-1.7.0.tar.gz 84492 SHA256 4cac3410af8b62f50a6496962af3884bdb1f99d30439511489e8a807e89379f8 SHA512 f7fc0f1028cfd2c4bc6cdf07b2e64cd6ed213676368bb3a6dba4334bbae00ac7afe0576e9fc2e299b1b251342fa7080ab15c1f52e961da7462e904b427932370 WHIRLPOOL 67f8d7e0c3bb1f4aef4db8a9785aa99d1433c7e2f62a95892bcfb48b813904d5c2422a5ff2ca79a1d91a509420ebd17a443b393555bec57ace20d534867e61f4
+DIST tox-1.7.1.tar.gz 84635 SHA256 869cb9e07847a9f0238f5a5029f3621504a5a3ec05af6d878e879b354c6851c4 SHA512 71135f2e1644db28cbfae42be1ed68e55e61fd1ba87bca735d367d36a42ec0a0c03bbcb171514ef38cb64e8b15b66987112d3339e03abaf274d098a9efb1cf93 WHIRLPOOL 6219466a4e2237e3eaf1523150e1a71d73adfe596a3d63700b72b3a3d2f6fd5f09944566667c9264b810b633d987ca1024c12835c46e370d031264b81beb13df
diff --git a/dev-python/tox/tox-1.7.1.ebuild b/dev-python/tox/tox-1.7.1.ebuild
new file mode 100644
index 000000000000..59a190dd0efa
--- /dev/null
+++ b/dev-python/tox/tox-1.7.1.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-python/tox/tox-1.7.1.ebuild,v 1.1 2014/05/03 07:57:37 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="http://tox.testrun.org http://pypi.python.org/pypi/tox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	distutils_install_for_testing
+	py.test -x || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
index eeece659b636..129216d293c4 100644
--- a/dev-python/twitter/Manifest
+++ b/dev-python/twitter/Manifest
@@ -1,2 +1,3 @@
 DIST twitter-1.10.2.tar.gz 36795 SHA256 4fac0a3e72fc42cbbfbd608e7fbbe7707cb7a18c5664e5cbd8ad5dfbf627fd5c SHA512 1f8d7b766b5617d8ddaee44e75f4f8493cdad9a3388b05d690e7ec195054a851eb1856560035353b1ed7e4f16708c96dc1051d209243d9f638d9ce478a414081 WHIRLPOOL e95e44986e987bbdbe7bfe9ea822de3b13872381c8a1b9d7a1d65cbc12b5f2c49b4e25e23cc6872cb3a00f432302d6f2eecf5ac8305d0df32f6886295157dd36
 DIST twitter-1.14.1.tar.gz 39272 SHA256 f56cd576885d77188071a31642fdcf5f81fff39609b07f6037624f1920e96733 SHA512 cac096ef498e53c79b0155a5063a2b1981f060c62b09051d675ed0b6dcb0b6cc04c6a034f40ab734d5aa508c72b67f4844a9143f0683878e06da046913f40ba8 WHIRLPOOL 3b95f48e2cb8c347738ae86cbaba5261c0bcb746e44b8474b36efbbbbd3add796feab9c00f0da46844c9d7d23fcfaf305b8ba5e110bc16da757bf9353f897b2d
+DIST twitter-1.14.3.tar.gz 39538 SHA256 497fce2168cb57d5651932a39b70fc0c9304bebd53558107995102bca49210da SHA512 821af749b34d01319630388cb287af88f1e516d8d6117088e63d988cf2a397a70c2770df2e1f208bcfa9a18224aae98e7c2a6bb62b4fc8653e2bceed7f39a92c WHIRLPOOL 6ec6fa7a124aeceedc5a58a89f7ff5a6fed6d6f09993dbb3e581b7ef55810440390b8d8b22e4139aa7a770f203c065c2a75a149ff7d025491c7e11b3be97a00f
diff --git a/dev-python/twitter/twitter-1.14.3.ebuild b/dev-python/twitter/twitter-1.14.3.ebuild
new file mode 100644
index 000000000000..246c04d08b99
--- /dev/null
+++ b/dev-python/twitter/twitter-1.14.3.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-python/twitter/twitter-1.14.3.ebuild,v 1.1 2014/05/03 08:42:11 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
+HOMEPAGE="http://mike.verdone.ca/twitter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 2ad29a26cf68..dc734fd8e4b3 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,4 +2,5 @@ DIST virtualenv-1.10.1.tar.gz 1327717 SHA256 8778f2c932dcc115514284ac827d710b764
 DIST virtualenv-1.10.tar.gz 1325423 SHA256 bb65e9160a8f014c2a5c5bfc77845a367df88aca214b33474ed23517a647e389 SHA512 fbb78492adfd826f0862feee0208d38c982d9d93b56e23a8020d29540017e302c34e9b03155721a1495c94847afee345ea355c2fc401275e2ecd549622adc7d4 WHIRLPOOL 99d97d5a90e0dedcabe54914d768cb0953bb393222c397fb074c13ffffc74d2d717a964700fb0a7bffe3d3c84651c5a353fa8b0fe29c592cd2e350e463b64a9b
 DIST virtualenv-1.11.3.tar.gz 1745970 SHA256 c76acdcac465c52ff6f2a13471e5ad6855709fd6a48ec1320300a2e95cd35ec2 SHA512 4140596aeb2f16f5e5e1c7ea9c1dcc9e7cdb06db1db0f7906b4fb5d40cff31665bacf8870b32c930e3eeaac3a36cd8b53343dc3e53d9e8ef85e2626fc959275d WHIRLPOOL 88d3b484bdfb15afd30618f1106138bcdbdb0aff6f8c9bde2ea4371fbd26ed18e637b6edbf805c04a5650f751f6a2639f2e4d330fd0a80adaa70cba6fbb26095
 DIST virtualenv-1.11.4.tar.gz 1746033 SHA256 7420b06b0dd655a765297b41941f63d31b4ba5d94f8082f4211ec4b2c65ecd82 SHA512 053fdca494cf78cb4a5f2c328a2e6c4296e60f6567149b2928cd55eff71cd16412fb85c5a2127a10cfd9458be11f097eb8a1ee3562cc378fe7dc750e3f9941d5 WHIRLPOOL 722b25b6c96ef9856e5b063c9155d26545d06ca6f67c2823a0353ce678f25e9aa1f1b1d5def34d835ef00a9bc04e4e6380f4964aa410dfe8d1ea2261648b0af2
+DIST virtualenv-1.11.5.tar.gz 1754514 SHA256 debe5cae77afc2517bcda3f3b9c2cc7e73c61715b80cd3cc57ba20cdea019a03 SHA512 98749fff232b3f45905eff8ad048b6b358e95d03a9bee8042c306f26c13d736c209218e3d79bb608f0803b8307104c5f0872be8ae87bcf000cc6e02ad729893c WHIRLPOOL a5d3d41003b7934bd7b53a422f39052075a6b6fb477712739546197d81c9c5ee90d5ab8dc08371fe37df498828682fda7afb081f4e1af12cd43ce2dc303b9b33
 DIST virtualenv-1.9.1.tar.gz 2007470 SHA256 b095484a235606bdcaba7992702f5736d454f2e758626ede6b346ca0d64a32a1 SHA512 f7a33b9d488e9d9543cd1b08b40ebf6e6ecda68a411a566d93dfcaa48a4e0068713cbe3ac503961d33fa3710df4e3d243edab29fd888e0244f694bebff8d0fed WHIRLPOOL 0f4b2b82840d268d1bd5d51d85621f76b9c7e97cd7e4166bcec3c82700b1373d97bc236fcc6a18bd57b22cec09dc8ee95c2e107b89f243311defa685a097c5d9
diff --git a/dev-python/virtualenv/virtualenv-1.11.5.ebuild b/dev-python/virtualenv/virtualenv-1.11.5.ebuild
new file mode 100644
index 000000000000..0cad9bcdbd39
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-1.11.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.11.5.ebuild,v 1.1 2014/05/03 07:39:16 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="http://www.virtualenv.org/ http://pypi.python.org/pypi/virtualenv"
+SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( docs/index.rst docs/news.rst )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
+	"${FILESDIR}"/${PN}-1.11.3-skip-broken-test.patch
+)
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 67459b3d90e8..49c58117abc0 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -3,3 +3,4 @@ DIST ws4py-0.2.2.tar.gz 1859370 SHA256 591014a09e4cd492c85ef5c46ce88586e29f9db94
 DIST ws4py-0.2.3.tar.gz 1858465 SHA256 4a56ab45af5df80ea243faa6970b4f7d5e9eff10d9ea732941e4f5a1dafed9b7 SHA512 f5b7cb2fdc17978fbd60e865736a22e4a4989b7094acd3931011b4cf4e44294d3aeb4d0f1f312a6934d34b2abde970b2ef1e039b2526d9592573e0000ca281bb WHIRLPOOL cf4324109dc878d1f0d592f51dcf287ff036116792b16250b80427ef8d3f5b66eca565eaadb2a39c473421bbc5fae14860142174e92fcc76cce2bebf9cb40cc6
 DIST ws4py-0.2.4.tar.gz 45057 SHA256 fa9f1e0ef56f1a864ac4fa0abb7ea1e426f7655fbbc93c754e19e8d976a5c23d SHA512 1e3522d63f0d8e5487b41e429d22e40c12522ee441377e1885685013f1506874e1feb280446374cd1654bbffffdcda737c3de0065bdf62d5b1cc07a837916a85 WHIRLPOOL bca0b08aaa706449b6115606a37785acb5fdbaca5ccf43d77c56be51caf4056a5672944e9f5aaa7b219218b96c0802da40cf347a39a259bd68469cf9e383f9a4
 DIST ws4py-0.3.2.tar.gz 58961 SHA256 76b13b6e3a36519dc46f3e156da21dc68fb02d08dd17d85d44dfcb532e3a45df SHA512 2363ecd416755ed4e0a199e351ccb9739450741d234a6e5a9505cde1be2d233658a2e24f80897eb3eece6f57b7e7b358ed9a0d634b39b2c745c6a686179b2554 WHIRLPOOL 90ac9d9b416f4f23d2611aff50008fa0231d1d9c29d8f30b9caf47c27b75eb7711268ac4b58e220bf25cd242a6f3d0c80fd72a17434890f6db78a7d54213ffbe
+DIST ws4py-0.3.3.tar.gz 65132 SHA256 5dbea58201f3f9dabb3897778dce46ed58a215db6cc6d5d5c52f77734e79ae1e SHA512 2cc3cb68e9a3598ece024ef8998f04007b53908e4c98446170b91c54a56b736f395f36a976c6c69e8d0d56d87142f436f15ecbe1e3ad986369ef3f50eedf4f3b WHIRLPOOL 621a34ee27e0b79a78aedbb5f9b0c7ca4ff9a4ffc2b1229cb047e375d8c38870ea21aea0f3b936a52de57bd9d639ac1b7fc6f98960181b05e7e860ed335adf26
diff --git a/dev-python/ws4py/ws4py-0.3.3.ebuild b/dev-python/ws4py/ws4py-0.3.3.ebuild
new file mode 100644
index 000000000000..7b3f40cabab7
--- /dev/null
+++ b/dev-python/ws4py/ws4py-0.3.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.3.3.ebuild,v 1.1 2014/05/03 08:12:25 patrick Exp $
+
+# We could depend on dev-python/cherrypy when USE=server, but
+# that is an optional component ...
+# Same for www-servers/tornado and USE=client ...
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads?"
+
+inherit distutils-r1
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Lawouach/WebSocket-for-Python.git"
+	inherit git-2
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="WebSocket support for Python"
+HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+client +server test +threads"
+
+RDEPEND=""
+DEPEND="test? (
+		${RDEPEND}
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		>=dev-python/cherrypy-3.2.0[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	use client || rm -rf "${ED}$(python_get_sitedir)"/ws4py/client
+	use server || rm -rf "${ED}$(python_get_sitedir)"/ws4py/server
+}
diff --git a/dev-python/wsgiintercept/Manifest b/dev-python/wsgiintercept/Manifest
index 1a1251d41ba1..a70368b1fb9d 100644
--- a/dev-python/wsgiintercept/Manifest
+++ b/dev-python/wsgiintercept/Manifest
@@ -1,3 +1,4 @@
 DIST wsgi_intercept-0.5.1.tar.gz 40797 SHA256 0603a5735152c6da7b31225fc659745838addc15231b39226d68039b6773ba2e SHA512 d1db66e8724cc7226198a3690294b32fa2b52cfd668a380b4feaa5a97d3587721da44733560ddfe45780df31eb898330f97d65da9332d2d84359d886171b29d5 WHIRLPOOL fb4616f2b04399b802c7baf8593128fb353d223da9bc031954df0d797d08c64e0a4630ac74a7276549c572e6f13345f922ecf68ef8fdfe2dba7ff324e9dc8040
 DIST wsgi_intercept-0.6.0.tar.gz 9830 SHA256 fbee9bb0fe6aace0c6297d217bf9910a5099faa173e7e26f69246f5f59dc8754 SHA512 434528d5ec9b2568bea11eecb3f2b8d86f9436c8ff580d013a7bb57d09b760994002ac23bec657720feb422bc4d00914d2e1e6ed7d8111e6e9f4b720904561e3 WHIRLPOOL 48fdf8ccdb0bc0aaa13604733167ed4c7e755a6b0308f283985b729e743021a8a93c01547eec3797d4d96b75a717c2cc0ac2c7da762f9195f1433b819db9b269
 DIST wsgi_intercept-0.6.1.tar.gz 9869 SHA256 656d6cea9c513e1a5db963d5210d579846cca166b47a3c4fcdd0633ce01516e9 SHA512 cffa66149e1d3302b71d60b21d3c00879bd7329bf149dbe5f6f7c4f58cc4b8da0aff4f43702be1688315baff3c3744b40696a44f86dd82ffb23fbc5e05a84bb6 WHIRLPOOL 99bd36cb768de4b80084086246c21a984158d18f0361bd94be362e517d74f076358b07af482841f8a0c2b9153d16a33a773457f874996ad413ca8717b0e9de12
+DIST wsgi_intercept-0.6.2.tar.gz 9883 SHA256 aa44166c53810d5268a496224ad87bca4f4bc035572729c363ae480a49dba97e SHA512 93152a18f9224aa00173df046536d70b8f4b7694810f16d3da6647751ef62fd3c7a584b5220ed2e3a4f2d753576ca8894938d2cb36698d9ebb3fd8d3cc607959 WHIRLPOOL 1266be906d518ad609ed4cabe7f87d3fd6da7d76edcf75285b098eef2b1c64f6da4088b8caa7756ca640a94403fc0f5bf92b35fa01e4754d4da4834172f9db87
diff --git a/dev-python/wsgiintercept/wsgiintercept-0.6.2.ebuild b/dev-python/wsgiintercept/wsgiintercept-0.6.2.ebuild
new file mode 100644
index 000000000000..fce0bdb43e2a
--- /dev/null
+++ b/dev-python/wsgiintercept/wsgiintercept-0.6.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-python/wsgiintercept/wsgiintercept-0.6.2.ebuild,v 1.1 2014/05/03 08:25:39 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+
+inherit distutils-r1
+
+MY_PN="wsgi_intercept"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="WSGI application in place of a real URI for testing"
+HOMEPAGE="https://pypi.python.org/pypi/wsgi_intercept https://github.com/cdent/python3-wsgi-intercept"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.4[${PYTHON_USEDEP}]
+		>=dev-python/requests-2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/0.6.0-fix-tests.patch" )
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/wtf-peewee/Manifest b/dev-python/wtf-peewee/Manifest
index 794964e36cf8..3b71232d8238 100644
--- a/dev-python/wtf-peewee/Manifest
+++ b/dev-python/wtf-peewee/Manifest
@@ -1,3 +1,4 @@
 DIST 0.1.3.tar.gz 57407 SHA256 35502c7b81df547dcf9cfbbff24dfbbecc2ddfc6e5c1692e4dbdf4516d44c574 SHA512 dcd7383b1d41541182418fd9cf77acdf6b01d8bb69962f936ee6f42a33505fd466875df50c28f60c768d357b8ea89c5e91c828ba7d1557954f311ddffa931d09 WHIRLPOOL 5a61012e226dc9055f9d5ea7e2b619e462226b9c99db7644c290b4e12972b69e228d0a1825d6e72a9fcb79f0a91ad15b8492461d1d923c7e0114623dd991b8e6
 DIST 0.1.4.tar.gz 59450 SHA256 c6fbb3d0135d22da4549c08144c83afe11564ec7899a420a3b5c7e2e65972e53 SHA512 d4673f3f6d9cbf95a9c7d9b7f6e2c21fac3177b20f855dca8eb2b1592b7c1060668b484c12f1b8c00b497a5aa04cfaf525ef68efd8091f0058fff685e0dbe306 WHIRLPOOL 0a17280f364ed2fb40dd8b8c43e57ede021c375bd4e03efbbb356f03d8927edd4d170c1634e69724609d1c175465d472a4a049aa8ce0afe2645a1374e9f484be
 DIST 0.1.5.tar.gz 59966 SHA256 8f9baf3502efd89ea9807ab95fca4ca00aac0dec7ac114551156d57574c56e9c SHA512 3b78e5214960195c9aff9f204c85ebc243f671f8dfe96002b049746594b4c3eb89186e2ebddfeaae1f33997b955d409b46cd0c3d65bbf06848c4f6a1f6b9dd22 WHIRLPOOL 1d339c71ce8b4395f2e81c5a0e52629adc10b1cd7ef61a9caeb6fffc706377fbf380777c774fd913d41a2ec0ff07970eb09d11e125fe33ec41869fc531af8924
+DIST 0.2.0.tar.gz 59904 SHA256 ca4d7a53696d6bd2004c01e952f67cd9503741b9ef5a2ac64473bd4c3b999b2a SHA512 b2b99b471a251441efcd2b0c0df371ffca0ae4c1ce7a99ba709ba3a94d83360314c649747dbb9750d6482b7c77ea286f355744f74d89af70bb48da0f0d4eeccb WHIRLPOOL 6fbefaf434a677fa64633bafb621de7bf3dad62f59f0b6f279116900e334b574a1c1ab962bb3e9de3c1ccdc343ca839772ffeaf89dc9e92e36f0bf4aec321caf
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.0.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.0.ebuild
new file mode 100644
index 000000000000..841ebe61f7c5
--- /dev/null
+++ b/dev-python/wtf-peewee/wtf-peewee-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.2.0.ebuild,v 1.1 2014/05/03 08:03:02 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+RESTRICT="test" # broken
+
+DESCRIPTION="Small python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/peewee[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]
+	"
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/xhtml2pdf/Manifest b/dev-python/xhtml2pdf/Manifest
index f6da3b741598..f23a4bfe6797 100644
--- a/dev-python/xhtml2pdf/Manifest
+++ b/dev-python/xhtml2pdf/Manifest
@@ -1 +1,2 @@
 DIST xhtml2pdf-0.0.5.tar.gz 97399 SHA256 1f108c09d0939025069e71e099ec88fb477076bdc781e54215d28a8d42fe5868 SHA512 7c737e8c7ac1018f6f355488a2762a2b448383bb868a34a69e1012fc1c6dc4559d2eb4de1117ee3957712990f5837d7289dc9291a5b1ecb391be0aea53f9b64d WHIRLPOOL fbe3ab0cff346a695edaeeedd7f2256a8fc471ec5a23b9e25ae733b075f931b3de78addc236d091e818f02dff4c62243737fe8c00edfe08f7ac78d0b0da9c5aa
+DIST xhtml2pdf-0.0.6.tar.gz 100628 SHA256 29dbf7da8943ccef4afb958747cd0084762821546e3cc62d23115fd7470d95f0 SHA512 b79f3a1c465ddda20e6b8ac28324d78bbb100a764d1ecd9eaec80f22f67d9266112b93ddfde067a077754058969f09e9ebed227369c3e718693d35cf451b43e9 WHIRLPOOL 1ee4d093cc8c28431d208e7496af155f1b0cb92e45a754c87dc5367aa71332239df216ec3a2045b913d0b237e92ca379c0501c1f5654af5ed491e6ba96d010f9
diff --git a/dev-python/xhtml2pdf/xhtml2pdf-0.0.6.ebuild b/dev-python/xhtml2pdf/xhtml2pdf-0.0.6.ebuild
new file mode 100644
index 000000000000..927dc5f2f2cf
--- /dev/null
+++ b/dev-python/xhtml2pdf/xhtml2pdf-0.0.6.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/xhtml2pdf/xhtml2pdf-0.0.6.ebuild,v 1.1 2014/05/03 06:12:24 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="PDF generator using HTML and CSS"
+HOMEPAGE="http://www.xhtml2pdf.com/ http://pypi.python.org/pypi/xhtml2pdf/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/html5lib[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pyPdf[${PYTHON_USEDEP}]
+	dev-python/reportlab[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild
index db8a8a53a866..1371a2463984 100644
--- a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild
+++ b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.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-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild,v 1.3 2013/09/14 10:06:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild,v 1.4 2014/05/04 12:14:52 maekke Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://qt-project.org/wiki/Category:Developing_with_Qt::QtMobility"
 SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 QT_MOBILITY_MODULES=(bearer connectivity +contacts feedback gallery
 		location messaging multimedia organizer publishsubscribe
diff --git a/dev-ruby/RubyInline/Manifest b/dev-ruby/RubyInline/Manifest
index f956b4bb77ed..f9f011570f82 100644
--- a/dev-ruby/RubyInline/Manifest
+++ b/dev-ruby/RubyInline/Manifest
@@ -1 +1,2 @@
 DIST RubyInline-3.12.2.gem 29184 SHA256 28506b5ab38faae32d8a242483996b197ed4e5cf0419652072af446c0a3fe971 SHA512 cef52a9a624bcae92f5231ba3d4e5809c186221a89a445409b0096e59712ea90f66568b6682731dfa8228b0c8441ed6cde86a6d80319c6b0d6698abb05252384 WHIRLPOOL 1dd9ed15e71013be5ad9fcb291324a8f42933d11f8be80c6e0f2a84ed0c02e877491612554b3b6de2236555439ce82e9360e86426723129d1bec06404069eb24
+DIST RubyInline-3.12.3.gem 31232 SHA256 c1ececb4057d22638818c1bf1998cdbe485bf6eda81c3fe52a543487c9c35ad6 SHA512 26b852abe21b077deca6206bac3a29e402e37b9bd96997275a8075172fee34d25e68b9455a933188bb71807e3fe2a35bf15350f568ba3786034796bc5a33f7cf WHIRLPOOL b42ba1f45206758d1dc50990c9be3b4167a40771f09eaeb352fbd2038515979fd307983d37c3a5aa4a1b32edc114aa5ed229e7573e387c112e54cb45fd5f5e16
diff --git a/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild
index b0dc31574953..626a8c0f5894 100644
--- a/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild
+++ b/dev-ruby/RubyInline/RubyInline-3.12.2.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/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild,v 1.9 2013/09/07 20:15:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild,v 1.10 2014/05/04 13:36:27 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/RubyInline/RubyInline-3.12.2-r1.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
similarity index 88%
rename from dev-ruby/RubyInline/RubyInline-3.12.2-r1.ebuild
rename to dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
index 6730eda51a52..76b73df8f451 100644
--- a/dev-ruby/RubyInline/RubyInline-3.12.2-r1.ebuild
+++ b/dev-ruby/RubyInline/RubyInline-3.12.3.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/dev-ruby/RubyInline/RubyInline-3.12.2-r1.ebuild,v 1.1 2013/10/09 01:57:12 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild,v 1.1 2014/05/04 13:36:27 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/activemodel/activemodel-3.2.17.ebuild b/dev-ruby/activemodel/activemodel-3.2.17.ebuild
index 30a573f5ff06..92c705b2793e 100644
--- a/dev-ruby/activemodel/activemodel-3.2.17.ebuild
+++ b/dev-ruby/activemodel/activemodel-3.2.17.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-ruby/activemodel/activemodel-3.2.17.ebuild,v 1.1 2014/02/19 07:18:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.2.17.ebuild,v 1.2 2014/05/04 11:30:08 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/activeresource/activeresource-3.2.17.ebuild b/dev-ruby/activeresource/activeresource-3.2.17.ebuild
index 088f4ccf6c7c..df1516bdfdbf 100644
--- a/dev-ruby/activeresource/activeresource-3.2.17.ebuild
+++ b/dev-ruby/activeresource/activeresource-3.2.17.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-ruby/activeresource/activeresource-3.2.17.ebuild,v 1.1 2014/02/19 07:18:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/activeresource-3.2.17.ebuild,v 1.2 2014/05/04 13:09:14 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/activesupport/activesupport-4.0.3.ebuild b/dev-ruby/activesupport/activesupport-4.0.3.ebuild
index 479550290229..65cfd400d36a 100644
--- a/dev-ruby/activesupport/activesupport-4.0.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-4.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-ruby/activesupport/activesupport-4.0.3.ebuild,v 1.2 2014/03/11 20:23:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-4.0.3.ebuild,v 1.3 2014/05/04 13:49:42 jer Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-4.0.4.ebuild b/dev-ruby/activesupport/activesupport-4.0.4.ebuild
index 1434ab8e6f39..9c8f279c7109 100644
--- a/dev-ruby/activesupport/activesupport-4.0.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-4.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-ruby/activesupport/activesupport-4.0.4.ebuild,v 1.2 2014/04/18 09:07:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-4.0.4.ebuild,v 1.3 2014/05/04 13:49:42 jer Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-4.1.0.ebuild b/dev-ruby/activesupport/activesupport-4.1.0.ebuild
index bf4a92ab075c..82a8023ac293 100644
--- a/dev-ruby/activesupport/activesupport-4.1.0.ebuild
+++ b/dev-ruby/activesupport/activesupport-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-ruby/activesupport/activesupport-4.1.0.ebuild,v 1.1 2014/04/26 15:08:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-4.1.0.ebuild,v 1.2 2014/05/04 13:49:42 jer Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild b/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild
index 93b5319eed6f..831ec658ed23 100644
--- a/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild
+++ b/dev-ruby/blankslate/blankslate-2.1.2.4.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/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild,v 1.1 2013/12/13 02:09:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild,v 1.2 2014/05/03 20:33:44 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_EXTRADOC="README"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/builder/builder-2.1.2-r4.ebuild b/dev-ruby/builder/builder-2.1.2-r4.ebuild
new file mode 100644
index 000000000000..7d7a01326b9d
--- /dev/null
+++ b/dev-ruby/builder/builder-2.1.2-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r4.ebuild,v 1.1 2014/05/04 12:35:18 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="test_all"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README CHANGES"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A builder to facilitate programatic generation of XML markup"
+HOMEPAGE="http://rubyforge.org/projects/builder/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-activesupport.patch "${FILESDIR}"/${P}-fix-tests.patch )
+
+all_ruby_prepare() {
+	sed -i -e '/rdoc\.template .*jamis/d' Rakefile || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19|*ruby20|*ruby21)
+			rm test/testblankslate.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -S testrb test/test*.rb || die
+}
diff --git a/dev-ruby/builder/builder-3.0.4-r1.ebuild b/dev-ruby/builder/builder-3.0.4-r1.ebuild
index 75b3dff0ad30..9a7913d7936a 100644
--- a/dev-ruby/builder/builder-3.0.4-r1.ebuild
+++ b/dev-ruby/builder/builder-3.0.4-r1.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-ruby/builder/builder-3.0.4-r1.ebuild,v 1.1 2014/04/20 18:06:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.0.4-r1.ebuild,v 1.2 2014/05/04 12:35:18 mrueg Exp $
 
-EAPI=4
+EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="test_all"
diff --git a/dev-ruby/dalli/dalli-2.6.4.ebuild b/dev-ruby/dalli/dalli-2.6.4.ebuild
index 0c10ab3a3047..8cbfee218d41 100644
--- a/dev-ruby/dalli/dalli-2.6.4.ebuild
+++ b/dev-ruby/dalli/dalli-2.6.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/dalli/dalli-2.6.4.ebuild,v 1.5 2014/04/18 09:01:08 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild,v 1.6 2014/05/04 13:49:11 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -16,7 +16,7 @@ DESCRIPTION="A high performance pure Ruby client for accessing memcached servers
 HOMEPAGE="http://github.com/mperham/dalli"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
diff --git a/dev-ruby/dotenv-deployment/Manifest b/dev-ruby/dotenv-deployment/Manifest
new file mode 100644
index 000000000000..005af2e671a3
--- /dev/null
+++ b/dev-ruby/dotenv-deployment/Manifest
@@ -0,0 +1 @@
+DIST dotenv-deployment-0.0.2.gem 7168 SHA256 0c7db97431f091e11b88f26fd08d3f1a0570128d5e73a465c0380195b034a6a9 SHA512 03079ac8e1d1e7520e1ccc60c0b487454b7d1bbf8d8ac6cae6d9c1d5632714009bc2c982b7e5a9df92e008a48ebe63b9047a0a3e2e56fc028cceebe01be6e1c0 WHIRLPOOL e3d96291aec0d671b71188024ac3eae4271efda7e92a20b7aadc26bba68514f18002ab71508e6ed691bdcb261cdfe0936eab77a3a20f40c17304ffa68ebdfe51
diff --git a/dev-ruby/dotenv-deployment/dotenv-deployment-0.0.2.ebuild b/dev-ruby/dotenv-deployment/dotenv-deployment-0.0.2.ebuild
new file mode 100644
index 000000000000..fe9e3019805f
--- /dev/null
+++ b/dev-ruby/dotenv-deployment/dotenv-deployment-0.0.2.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-ruby/dotenv-deployment/dotenv-deployment-0.0.2.ebuild,v 1.1 2014/05/03 05:56:16 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Deployment concerns for dotenv"
+HOMEPAGE="https://github.com/bkeepers/dotenv-deployment"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
diff --git a/www-apache/mod_ruby/metadata.xml b/dev-ruby/dotenv-deployment/metadata.xml
similarity index 87%
rename from www-apache/mod_ruby/metadata.xml
rename to dev-ruby/dotenv-deployment/metadata.xml
index 0040b1162894..852136183369 100644
--- a/www-apache/mod_ruby/metadata.xml
+++ b/dev-ruby/dotenv-deployment/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>ruby</herd>
+<herd>ruby</herd>
 </pkgmetadata>
diff --git a/dev-ruby/factory_girl/Manifest b/dev-ruby/factory_girl/Manifest
index de04240a1ce3..9ad5f2ca1655 100644
--- a/dev-ruby/factory_girl/Manifest
+++ b/dev-ruby/factory_girl/Manifest
@@ -1 +1,2 @@
 DIST factory_girl-4.2.0.gem 60416 SHA256 c1e47e17da6bbf6dd47e402295296311abc1eeb22ccd6862a2d9d6bcedfc6c50 SHA512 96417a404d7930e9f553ddc5de37ddbe4bf6f5853afd87d83f12c11f70f440c3f2c1a66b47a103dc2cd0d8ca643c584cadc92268d867497b75d56b43700b568b WHIRLPOOL 227910dc99bcddef7e18d90e03c5741f451bd73603246b3be85a20796766413e24df9e6f36f9117c56567d18957a96c03efdf4310bbf495798f3846f69b30de1
+DIST factory_girl-4.4.0.gem 62976 SHA256 4daa112a2dcd4524d1f2bec81f73cccdc9ed8f3e9112523300de70764db10f72 SHA512 094ff5536c8663b4e8fb6ad35b6575a710296b9b2258e617fe5624c882080ca6721c5cff15a92d705d5d4d3604400269f25624b2b88eea330bc7fe097ba83716 WHIRLPOOL 7afa3f1ea69d353fcf0a096d9b01075a4ef82476fd9de949c2efb19a1b8d8a1a069d10b9b8fdfac1046ffccdf3990dd5957920486c42cf9f293d8600c5432ad9
diff --git a/dev-ruby/factory_girl/factory_girl-4.4.0.ebuild b/dev-ruby/factory_girl/factory_girl-4.4.0.ebuild
new file mode 100644
index 000000000000..65ad0410be75
--- /dev/null
+++ b/dev-ruby/factory_girl/factory_girl-4.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/factory_girl/factory_girl-4.4.0.ebuild,v 1.1 2014/05/03 06:14:32 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+# Tests depend on unpackaged appraisal
+RUBY_FAKEGEM_RECIPE_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="GETTING_STARTED.md NEWS README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+
+inherit ruby-fakegem
+
+DESCRIPTION="factory_girl provides a framework and DSL for defining and using factories"
+HOMEPAGE="https://github.com/thoughtbot/factory_girl"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0"
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.2.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.2.ebuild
index b7bf2f818411..71d2b00a0c37 100644
--- a/dev-ruby/http-cookie/http-cookie-1.0.2.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.2.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-ruby/http-cookie/http-cookie-1.0.2.ebuild,v 1.1 2013/12/13 09:23:37 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/http-cookie/http-cookie-1.0.2.ebuild,v 1.2 2014/05/03 07:10:03 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
+
 all_ruby_prepare() {
 	sed -i -e "/simplecov/d" Rakefile || die
 }
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 2163195d6d35..09ed93dc6e14 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1 +1,2 @@
 DIST httparty-0.13.0.gem 71680 SHA256 5c8ad1664ebd51c7bded6a96138d804549c030b413ad685b8b3940dea137aae1 SHA512 c105db82e8a4883752439502d02536d30ea791c6c1eea8772620cca75c678e2be355acc6f8f424b92ca3a5b7a758eb1d72fce42a5c3c4325f6c57eb53a1b015f WHIRLPOOL 51f7f3ce7b2cf9823e0ffcc3781b919886a568f68f8dc5a5fec47af4b8e700ecb8ec1df4c89fa0fb70c867f6c508795fdebb46d4294cbada8edf0400d7389b6a
+DIST httparty-0.13.1.gem 72192 SHA256 d2b97f77e388cfa86d9f697dbdcd30ef600474e17f3c0a717e554e551a3fc92f SHA512 d5571aeb03c0035efe4b2b7fa441110278f834094d8e94745590b640ad6d01e846a666e925578cbecd53dc393931e3ee548400ee4e9ec641abd1eb5dc3fbde48 WHIRLPOOL e2fc952da3108a73372b28d3f53ea51d8bc49ed6b6727b9ec70a23f3dcc8ee581332a15449deaccb908d845434bc9ac4e967f1c0def1252769c29743c92d2109
diff --git a/dev-ruby/httparty/httparty-0.13.1.ebuild b/dev-ruby/httparty/httparty-0.13.1.ebuild
new file mode 100644
index 000000000000..82ee58fec7e3
--- /dev/null
+++ b/dev-ruby/httparty/httparty-0.13.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httparty/httparty-0.13.1.ebuild,v 1.1 2014/05/03 06:18:28 graaff Exp $
+
+EAPI=5
+
+# jruby → testsuite fails (seems like a testuite bug)
+USE_RUBY="ruby19"
+
+# We have a custom test function, but don't null this out so that the
+# deps are still added
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy."
+HOMEPAGE="http://httparty.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend '=dev-ruby/multi_json-1* >=dev-ruby/multi_xml-0.5.2'
+
+ruby_add_bdepend 'dev-ruby/rspec:0 dev-ruby/fakeweb'
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+#	sed -i -e '/git ls-files/ s:^:#:' ${PN}.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -S rake spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch b/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch
new file mode 100644
index 000000000000..f977172e6464
--- /dev/null
+++ b/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch
@@ -0,0 +1,66 @@
+From d836e960d9a20c4c5bc986630d2ba34a340959ea Mon Sep 17 00:00:00 2001
+From: Aaron Patterson <aaron.patterson@gmail.com>
+Date: Fri, 27 Jul 2012 11:20:58 -0700
+Subject: [PATCH] fix assertion calls
+
+---
+ test/path/test_pattern.rb | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/test/path/test_pattern.rb b/test/path/test_pattern.rb
+index c684a0a..ec93471 100644
+--- a/test/path/test_pattern.rb
++++ b/test/path/test_pattern.rb
+@@ -85,9 +85,9 @@ def test_to_regexp_with_extended_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/tender', path)
+-        assert_match('/page/love', path)
+-        refute_match('/page/loving', path)
++        assert_match(path, '/page/tender')
++        assert_match(path, '/page/love')
++        refute_match(path, '/page/loving')
+       end
+ 
+       def test_optional_names
+@@ -108,8 +108,8 @@ def test_to_regexp_match_non_optional
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/123', path)
+-        refute_match('/', path)
++        assert_match(path, '/123')
++        refute_match(path, '/')
+       end
+ 
+       def test_to_regexp_with_group
+@@ -119,9 +119,9 @@ def test_to_regexp_with_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/tender', path)
+-        assert_match('/page/love', path)
+-        refute_match('/page/loving', path)
++        assert_match(path, '/page/tender')
++        assert_match(path, '/page/love')
++        refute_match(path, '/page/loving')
+       end
+ 
+       def test_ast_sets_regular_expressions
+@@ -186,9 +186,9 @@ def test_insensitive_regexp_with_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/TENDER/aaron', path)
+-        assert_match('/page/loVE/aaron', path)
+-        refute_match('/page/loVE/AAron', path)
++        assert_match(path, '/page/TENDER/aaron')
++        assert_match(path, '/page/loVE/aaron')
++        refute_match(path, '/page/loVE/AAron')
+       end
+ 
+       def test_to_regexp_with_strexp
+-- 
+1.9.1
+
diff --git a/dev-ruby/journey/journey-1.0.4.ebuild b/dev-ruby/journey/journey-1.0.4-r1.ebuild
similarity index 72%
rename from dev-ruby/journey/journey-1.0.4.ebuild
rename to dev-ruby/journey/journey-1.0.4-r1.ebuild
index 5648c979a5bd..fc40c5c9928b 100644
--- a/dev-ruby/journey/journey-1.0.4.ebuild
+++ b/dev-ruby/journey/journey-1.0.4-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-ruby/journey/journey-1.0.4.ebuild,v 1.4 2014/04/05 23:28:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/journey/journey-1.0.4-r1.ebuild,v 1.1 2014/05/04 13:07:01 mrueg Exp $
 
-EAPI=4
-USE_RUBY="ruby19"
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -21,4 +21,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/hoe )"
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/json dev-ruby/minitest )"
+ruby_add_bdepend "test? ( dev-ruby/hoe
+	dev-ruby/json
+	dev-ruby/minitest )"
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
diff --git a/dev-ruby/mixlib-cli/Manifest b/dev-ruby/mixlib-cli/Manifest
index da58387a00f9..3bbff0ccc4a2 100644
--- a/dev-ruby/mixlib-cli/Manifest
+++ b/dev-ruby/mixlib-cli/Manifest
@@ -1,2 +1,3 @@
 DIST mixlib-cli-1.3.0.tgz 10879 SHA256 f510810893d80b4b1a5d7ae44a04ea122ef1fb3ae4e4d7c3830b80b671cf35a1 SHA512 b21ea432a3ad8e20149ebc941c914ebaa6e8dd496b045b04a30df89597d0d6d359da8bc3be58d5de711891d0a2b05acc327c2ac0246fdf4601b1b0c4edf668ba WHIRLPOOL 3c76db2aced7ce6658ddf251455c123f5e22ea3965f865ec5e89a65a2de453e20f7cc3fc4a81b54ad78b5ccbab88042b6a54cd0aa625ad1e4d7e43950c48898f
 DIST mixlib-cli-1.4.0.tgz 10927 SHA256 3eb53a121db486da18bf47cae6bd1cf25b957ef1fde1bc9e1ebadb3d2b6815c4 SHA512 7d32f32277ec67bef5f33524a3024b98be316bb8a16eb93c94bd2c9213f0640990dd898ecf2455a74bf04b7ab5fa9f8c22a558272a55ed938beaae274bf0deb3 WHIRLPOOL beddbdb78e558c12afec15158bee3dbec59cacf9f7ddf803aa0d912c514f4d6cde1cffae416cd873a93b9dbd20dc03d01f2db3b54f9e4191b6bf61df410b9222
+DIST mixlib-cli-1.5.0.tgz 11131 SHA256 810e91b8dfa43b3d32b5a305b5e42e7b359ba19a8e463c3384a7002428ce8a8c SHA512 7cef81462d19be9d20d54f9c03552ad32a5b1d55769d06d3e5da052c31da5481eb2e3bf999bf005996194304a8375fff8a709d9b7d14e926c3adb8eba485c188 WHIRLPOOL 1f8ab04a3610ba0136ea156e625275370ec28b8061773877165712a2e9e7937c241f341a8ef4545b926d9e6dc94d2d636b76a7e0d475d315da876c425b2091b5
diff --git a/dev-ruby/mixlib-cli/mixlib-cli-1.5.0.ebuild b/dev-ruby/mixlib-cli/mixlib-cli-1.5.0.ebuild
new file mode 100644
index 000000000000..8a247b48974d
--- /dev/null
+++ b/dev-ruby/mixlib-cli/mixlib-cli-1.5.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/mixlib-cli/mixlib-cli-1.5.0.ebuild,v 1.1 2014/05/03 07:29:51 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mixin for creating command line applications"
+HOMEPAGE="http://github.com/opscode/mixlib-cli"
+SRC_URI="https://github.com/opscode/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
diff --git a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
new file mode 100644
index 000000000000..638211b6104b
--- /dev/null
+++ b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
@@ -0,0 +1,51 @@
+# 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.1 2014/05/04 11:40:35 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc RELEASE.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock"
+HOMEPAGE="http://mocha.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0.10"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~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/coderay )"
+
+ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	# Use syntax that works with all versions of coderay
+	sed -i -e 's/html.div/html(:wrap => :div)/' Rakefile || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rake examples || die
+	fi
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*.rb || die
+}
diff --git a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
new file mode 100644
index 000000000000..a69aabfffdf0
--- /dev/null
+++ b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
@@ -0,0 +1,52 @@
+# 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.1 2014/05/04 11:40:35 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC="yardoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc RELEASE.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock"
+HOMEPAGE="http://gofreerange.com/mocha/docs/"
+
+LICENSE="MIT"
+SLOT="0.11"
+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"
+IUSE=""
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )"
+
+ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rake examples || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb test/unit/* || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*.rb || die
+}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 080b90387fdd..608d0f3981af 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -2,3 +2,4 @@ DIST multi_json-1.5.0.gem 15872 SHA256 e94cf8a6db88eb35657b20f5a17631fcc7e46a867
 DIST multi_json-1.6.1.gem 24064 SHA256 8fe5991287b6d1a77719feaa03e460ab1f8c689b326106f6e627c54419d7635c SHA512 1672a4c7cad6ad4f9bd532b425a71ec7be2115675c04f66afbb203f2e1c078543175e4d0e01f118e86e503d29e078f52a6beb043e98af4e51de3c32f5eba402b WHIRLPOOL 5f1cf218f9214d3f2e62aa54c5cc8bf3175269f66d13e6f1f73e4235112bdaa10b88cca9887ca1f4eb2f2cefad8360b4a81add877d16dc767667bc357b62b226
 DIST multi_json-1.8.4.gem 29696 SHA256 011a3868b5179a3c8bc87b6f3568124d6e2ee0d4f19321ce8c976b0668164585 SHA512 a998f2800bdad3990dc678d538095671307958a2996c3eaaa08430c53dfab33421aacba1a579d7afc7f4c6d8994bd3c61fec4467d0cd2e14a8145d709cee8963 WHIRLPOOL 32db0dc927b816010587d22bc71cbf72bafd1a9d080a43abf3ef910ce15d32a3dae72ec12cbcbc2cdb6c9deabd5f2810ab65d47ff841d3fa0cff798b8c58b212
 DIST multi_json-1.9.2.gem 30720 SHA256 0700b91d359f01a603dc915115a5467fcf57473b68396ffc919a3a7d3ee381c5 SHA512 4ae186c0851cc3517257178951413275b9e1a0bb2449c1b50928355e1cf598f6dfcfb8842051bdab07d0b537a52fd50178d01f9912ada116a0a713e0cccb6783 WHIRLPOOL 0e2b7d7bcb6b4309e4f140995b2bf1cfd70ff6eaea961cf3eba549bdbef63cbc21c7a91b85e8a0eed708fc778440dbb2b6a587dadaab3b73e9e5762950dc7248
+DIST multi_json-1.9.3.gem 30720 SHA256 631390d4b6c3d3753a3df0c28339c8e7840704083dfdcefb1323a22ab97b2281 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5 WHIRLPOOL a96f1c1e53865e153bc83079fc70b69af6c941c4995f4215317ca53567532d1406adb174683fc8c5229fdc3563f5e8d3c2c662d77cf9d9d55367aab2df5b34f0
diff --git a/dev-ruby/multi_json/multi_json-1.9.3.ebuild b/dev-ruby/multi_json/multi_json-1.9.3.ebuild
new file mode 100644
index 000000000000..a80fd3ac79e3
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.9.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.9.3.ebuild,v 1.1 2014/05/03 07:52:07 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="http://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+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"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/activesupport-3* )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec:2 dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/json )"
+
+USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
+	rm Gemfile || die "Unable to remove bundler Gemfile."
+
+	# Remove unimportant rspec options not supported by rspec 2.6.
+	rm .rspec || die
+
+	# Remove specs specific to oj since we don't package oj yet.
+	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
+		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
+		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
+		-e '/using one-shot parser/,/^  end/ s:^:#:' \
+		spec/multi_json_spec.rb
+
+	# Avoid simplecov which only works with ruby 1.9
+	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
+
+	# Remove unpackaged and for our purposes unneeded coveralls
+	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
+
+	# Avoid testing unpackaged adapters
+	rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Compiled code is not supported for jruby 1.6
+			rm spec/json_gem_adapter_spec.rb || die
+			# jr_jackson is not supported but needed for the common tests.
+			rm spec/multi_json_spec.rb || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	for t in spec/*_spec.rb; do
+		${RUBY} -S rspec ${t} || die
+	done
+}
diff --git a/dev-ruby/narray/narray-0.6.0.8-r2.ebuild b/dev-ruby/narray/narray-0.6.0.8-r2.ebuild
new file mode 100644
index 000000000000..7811d3c0633b
--- /dev/null
+++ b/dev-ruby/narray/narray-0.6.0.8-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/narray/narray-0.6.0.8-r2.ebuild,v 1.1 2014/05/03 23:31:25 mrueg Exp $
+
+EAPI=5
+
+# jruby → native extension
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.en README.ja SPEC.en SPEC.ja"
+
+RUBY_FAKEGEM_VERSION="${PV/_p/.}"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Numerical N-dimensional Array class"
+HOMEPAGE="http://www.ir.isas.ac.jp/~masa/ruby/index-e.html"
+SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
+
+all_ruby_prepare() {
+	# the tests aren't really written to be a testsuite, so the
+	# failure cases will literally fail; ignore all of those ad
+	# instead expect that the rest won't fail.
+	sed -i -e '/[fF]ollowing will fail/,$ s:^:#:' \
+		-e '/next will fail/,$ s:^:#:' \
+		test/*.rb || die "sed failed"
+}
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp -l ${PN}$(get_modname) ${PN}.h ${PN}_config.h lib/ || die "copy of ${PN}$(get_modname) failed"
+}
+
+each_ruby_test() {
+	for unit in test/*; do
+		# Skip over the FFTW test because it needs a package we don't
+		# have in tree.
+		[[ ${unit} == test/testfftw.rb ]] && continue
+
+		${RUBY} -Ilib ${unit} || die "test ${unit} failed"
+	done
+}
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index ee7a0c3baffd..434cf54597f0 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -1,2 +1,3 @@
 DIST net-scp-1.0.4.gem 27136 SHA256 548494e245244d7bdc06015b60ca71e8c93574d511120e67eb26115482831f36 SHA512 2c8ddd1060fa62759ad6becc150986f32205b3c7807fe71cda01e473d4528b94dfc6412acb89308e2ad977f7e8287649f59a110d7a012fd8ffeb8389ec6f7f5f WHIRLPOOL 017caa4fc20b4af773531f2d056a97bfb9cd10c41d22a07fea4ee35862ca768ead7ca71890d8c100df292380adf01a747ad6308226f1a87b9c4d6ba93f8f0c06
 DIST net-scp-1.1.2.gem 32256 SHA256 f3d8848f63f9b7670e57af2e2c308e9bd6fddb7c5440a36e892478a1e62b5977 SHA512 5ba49a994a816b54aee32b5c3e708bed69fc22d7e688f60e93a1e2d29d086ed17f3685ea819d5db23a27abf8ba64fbd418204e1a1702fb0d2702607016febc09 WHIRLPOOL 08573792d16f1719ffbeabb621c4148823f649de43c8a0e8bea2506c329a3c653d21483113fa290022f3cfdd40713ac577d7816f2c77458dab5a80cf115432bd
+DIST net-scp-1.2.1.gem 32768 SHA256 928ca046246bdbfe304313c903bab95e7b711938ceff4a2c896b91ab59c6122c SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829 WHIRLPOOL 5adcb5746acc9e1fd8f19718c532c7192896d239b8240522e3df67d60e05550b9bd2360996b2343d9cab5dea643ada2d3c0bcc149753dcc5c1eb20e90d883f8c
diff --git a/dev-ruby/net-scp/net-scp-1.2.1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1.ebuild
new file mode 100644
index 000000000000..3e14b08e1b80
--- /dev/null
+++ b/dev-ruby/net-scp/net-scp-1.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-scp/net-scp-1.2.1.ebuild,v 1.1 2014/05/03 08:23:10 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
+HOMEPAGE="http://net-ssh.rubyforge.org/scp"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	doc? ( >=dev-ruby/net-ssh-2.6.5 )
+	test? (
+		>=dev-ruby/net-ssh-2.9.0
+		dev-ruby/mocha
+	)"
+
+ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/test_all.rb || die
+}
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 08a24c00d770..d9b9bdf13022 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,3 +1,4 @@
 DIST net-ssh-git-2.4.0.tgz 135388 SHA256 d2e41ca9fd63c6235d556efd030b8bc0f515f9588ad22330884630c67b0a8eaa SHA512 6e851d3e231169f2b1411c8bdc44212cafb52dcbbbba9d8a757aa8fdf52af31efb698cc6bcc103aa4006caffcc9c929fd50be5ad323a8fd2c3fe97e6f23a484a WHIRLPOOL 1d55a43109cb8f69da9ccf55281b7456445c68ff4e9c730b479ca62d0a9dc9ed70b4fdfadfbfa81cb94f5815142685445f6b48e2ad9588bd96152fbd4530c369
 DIST net-ssh-git-2.7.0.tgz 162416 SHA256 e3ff750efe855a325c76570b66e02c4db746f6a4760205a0c6f9264fd2ab5b64 SHA512 3c7fc123b71916435c95e648fffc77f424bd84b72ddcdae1e017dd9444fe92c58df84811586ec58e86705c1269f1ee0d5e4a68124ed2628e2dc80541bd9d64cf WHIRLPOOL 1663fb5f23e066788e5da39b32e2ca1ed16f920e2ed115009746362b31c49a42816d245fd298f31fcaffe7af60b3e1c78c4bf449ce4780a7c2117a9a7cec5171
 DIST net-ssh-git-2.8.0.tgz 164483 SHA256 313c63f205f72469aa48d25690b8f98c14cbe0bf90ed2d577191599d609a5b4f SHA512 b16394cdd8d0e3c92f5b22fc882615ef7309606b5d8a413711dda9b76f628c74bc29bad96f0166d31d9de55c14bed1df178053e2d8afa47d78d5d8053e70a631 WHIRLPOOL 1dc057363d847df650e8e704f50bbbe095859f4bda1e617c86f234da28bfbaf57ea5a65ea9b48ea3c999e0dc02a7345bb6a060820509f75bb17aeb6aa521963a
+DIST net-ssh-git-2.9.0.tgz 165699 SHA256 5f682fde2f0c50c58481430463d473d3e419b2cf9a7ee4ebaa15d2971c82a4a6 SHA512 19c777399448d588e0e46ac0a08839f778cf096afa1a991eaf57b208ab0caac0da65434e139114cd2cb8b30106b5db684cd3c65bd2c86a0adc7307aadd117dda WHIRLPOOL ea3365d53e08a224eaae2f2374dc1e2ba9670a7e60f0428571bf873417f293b72ee0ff9e8384dbbf5be90f44fcf94e0b5ec1aded77f744dc6faf705e27b1cc89
diff --git a/dev-ruby/net-ssh/net-ssh-2.9.0.ebuild b/dev-ruby/net-ssh/net-ssh-2.9.0.ebuild
new file mode 100644
index 000000000000..f2de53ca7a37
--- /dev/null
+++ b/dev-ruby/net-ssh/net-ssh-2.9.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/net-ssh/net-ssh-2.9.0.ebuild,v 1.1 2014/05/03 08:04:58 graaff Exp $
+
+EAPI=5
+# no longer compatible with ruby 1.8.
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
+RUBY_FAKEGEM_EXTRAINSTALL="support"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-interactive SSH processing in pure Ruby"
+HOMEPAGE="http://net-ssh.rubyforge.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2.6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
+}
diff --git a/dev-ruby/parslet/Manifest b/dev-ruby/parslet/Manifest
index aba6df27a6a3..9e54b29b49ef 100644
--- a/dev-ruby/parslet/Manifest
+++ b/dev-ruby/parslet/Manifest
@@ -1 +1,2 @@
 DIST parslet-1.5.0.tar.gz 219124 SHA256 28d939ee982758d2749d5bc717696de5c26c14f4be72db24647d9048c236c8a2 SHA512 dca8eae31e458c16b429c71996ac84011c78edf4b85657de3018c530ad315e96b4344f21574ff83a42bbd257fe3003f3c5926a78e9c637837e6b51b232e43db3 WHIRLPOOL c6942aeaf46cf6c59de1e996271ad00065fc90e0d77a12a239f004eb07aed2737ad4b8db5b9bde59c0f273652d57dbd036db79fe98957b96a9c016321f8ba119
+DIST parslet-1.6.0.tar.gz 234547 SHA256 866ccfd5f4ddf2f8aea88b1ad0bfbd2b84d515f75757ecc4c12375f8159498af SHA512 400d0944310e3a00f1462882ea9f508f602ca3c32db9ec46f08c3f0fad6d3afab322f7cb92ed7006b76355c88ac891a54e341a04355c8cd161a05334780f3f2d WHIRLPOOL 9fb29f0a9df0f94e04549a33341d1cbd7122b2a4abf7a7d64316120d1801a926d7cc86ad7b4f95157116e57c97534d0a016075c2ce6a54ebc734e44de2f5d761
diff --git a/dev-ruby/parslet/parslet-1.6.0.ebuild b/dev-ruby/parslet/parslet-1.6.0.ebuild
new file mode 100644
index 000000000000..58f970cd1bf4
--- /dev/null
+++ b/dev-ruby/parslet/parslet-1.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parslet/parslet-1.6.0.ebuild,v 1.1 2014/05/03 20:36:34 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_EXTRADOC="HISTORY.txt README"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A small PEG based parser library"
+HOMEPAGE="https://github.com/kschiess/parslet"
+SRC_URI="https://github.com/kschiess/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "dev-ruby/blankslate:2"
+
+all_ruby_prepare() {
+	sed -i -e "/sdoc/d" Rakefile || die
+}
diff --git a/dev-ruby/rack-ssl/Manifest b/dev-ruby/rack-ssl/Manifest
index 840b4cffad83..6551f8aa80ba 100644
--- a/dev-ruby/rack-ssl/Manifest
+++ b/dev-ruby/rack-ssl/Manifest
@@ -1,3 +1,2 @@
 DIST rack-ssl-1.3.4-git.tgz 3185 SHA256 b799b9a97ccd7f59979294f73ca135228deceed26fb8a8c2f5a19e37c33f2972 SHA512 4a52d30afd9306975579f9773b7fb59f4174fa095497a7071e48599ad261eb6bfbd040e49260f1996e94b897e38873b7d5b47dae494e09cc1ad22c7078458afc WHIRLPOOL b5242f53cfbfc92db9b76ed15e29f1d5ecb9e912a5dca57cb5c5542e69e62dbe65d376b0069cb41b48beb174a19029a5ed4907d1fa8eb9fbff98da7e4a7c842f
-DIST rack-ssl-1.4.0-git.tgz 3420 SHA256 2d2f7958529f9937578385214718ba9d15c4297f28cdf39ca1bf7b5f1035e4ad SHA512 1b17a09db6f52c1c2d3823f27c04150ab29570195eb3662014db904f71689f75820c6358869b2254535c3b9789cc5b8af91d4014d18b0881c5c44c73c22e8ed9 WHIRLPOOL cf6320b44cd1735f685b407ef26ecae0acab3599bb1a0ae52d02acd1c323db496a9907f737f9ed2d252ddb901a6de4ee829a1dda0904a583939b81ae7c175f78
 DIST rack-ssl-1.4.1-git.tgz 3238 SHA256 6070e5446025628c9559f522a57b5491a7a98e3194f9d108a7ed1d5e70f37cc8 SHA512 700a2cbc848be8e410186e6af709c5d7a8bae65ada02b405711dc60f8c6e1fe4fb00c3acc55ddc76a1d79e9468ba8f92d0350c983d5c1b83e4cee2b91aa68f23 WHIRLPOOL 7630e86429c9e14a3f6b88e9e8a25889eb921a3830ad5048e62e60acea86f12a262702f8ccd3fecd5b46ec662bc5378c3713a572acc38c1bb8079e6662102814
diff --git a/dev-ruby/rack-ssl/rack-ssl-1.3.4.ebuild b/dev-ruby/rack-ssl/rack-ssl-1.3.4.ebuild
index 69216b5ca1c3..4efb7b9d6a42 100644
--- a/dev-ruby/rack-ssl/rack-ssl-1.3.4.ebuild
+++ b/dev-ruby/rack-ssl/rack-ssl-1.3.4.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-ruby/rack-ssl/rack-ssl-1.3.4.ebuild,v 1.1 2014/04/21 09:04:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-ssl/rack-ssl-1.3.4.ebuild,v 1.2 2014/05/04 13:29:11 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/rack-ssl/rack-ssl-1.4.0.ebuild b/dev-ruby/rack-ssl/rack-ssl-1.4.0.ebuild
deleted file mode 100644
index ebd5e024ba11..000000000000
--- a/dev-ruby/rack-ssl/rack-ssl-1.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-ssl/rack-ssl-1.4.0.ebuild,v 1.1 2014/03/22 07:22:02 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="Force SSL/TLS in your app."
-HOMEPAGE="https://github.com/josh/rack-ssl/"
-SRC_URI="https://github.com/josh/rack-ssl/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rb-gsl/Manifest b/dev-ruby/rb-gsl/Manifest
index b8d750f647e3..5d90a31982e7 100644
--- a/dev-ruby/rb-gsl/Manifest
+++ b/dev-ruby/rb-gsl/Manifest
@@ -1,2 +1,2 @@
 DIST rb-gsl-1.15.3.1.gem 611840 SHA256 56bda6faba85ba1e1142acee114e676d8e0778f951784c2d1c4a4bdb36ae4ecc SHA512 7c57923ac4858f95cb47f12778cbc6eca3149a8af58c81f535d7c5d24302d78fe359ea2eba5999a41a8ba48378abd7fb69587f62310eb9bdaf4e6ec76b7e00f6 WHIRLPOOL e976c2df65136f64b128e3466735377905d964863c0443949098902d09c083b165d805c4da481308c141c36dbeccd11260fa78319c7329f2981182534619adb0
-DIST rb-gsl-1.16.0.gem 591360 SHA256 0e2e1a049649ccd1facd2c35fd85961bc2555f6bd1422a4534e12d4787001d04 SHA512 fe32035a20c9d829feaa8520c1b84330f7e8dbbefe19abb044158f098ec425bcc8eb7d7057560ce4d5077273731a51ad45010ac3963b01fa2033ebb9ef9c8975 WHIRLPOOL 9fa70ef8f92355f1a163d8de8544d67426620176290ae0070b14a7c8fba66dc5df3d5117db1935ebaba3f80ec9182c370650d6e21e13ea286caba9003a16843b
+DIST rb-gsl-1.16.0.1.gem 589824 SHA256 5a171bf1fc84fab3c723f9682961f37c12d83c26f5975173079bf5cf75688683 SHA512 47caf27546e3054be9cef14bd062752c8d1d52b4118f5faa1f98cec688601cdd75eaca4fb43d4711547e61eef8ca5397d32b7320631fa1c9cb0a1225dcaead20 WHIRLPOOL d01638a9fb0900c31dd15c9a0f78978c927484c17b03b50989e11c8794974ec7ced61b908745b5c5bd0140bdf64c5b61974530fc492262bcac8c444b34a4c760
diff --git a/dev-ruby/rb-gsl/rb-gsl-1.16.0.ebuild b/dev-ruby/rb-gsl/rb-gsl-1.16.0.1.ebuild
similarity index 76%
rename from dev-ruby/rb-gsl/rb-gsl-1.16.0.ebuild
rename to dev-ruby/rb-gsl/rb-gsl-1.16.0.1.ebuild
index 1e838c6028b5..521bdb8b8496 100644
--- a/dev-ruby/rb-gsl/rb-gsl-1.16.0.ebuild
+++ b/dev-ruby/rb-gsl/rb-gsl-1.16.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-ruby/rb-gsl/rb-gsl-1.16.0.ebuild,v 1.1 2014/03/31 01:55:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-gsl/rb-gsl-1.16.0.1.ebuild,v 1.1 2014/05/03 23:28:01 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -22,17 +22,19 @@ RDEPEND+=" sci-libs/gsl"
 
 RUBY_S="${PN}-${P}"
 
+ruby_add_rdepend "dev-ruby/narray"
+
 each_ruby_prepare() {
-	sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/extconf.rb || die
+	sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/gsl/extconf.rb || die
 }
 
 each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
+	${RUBY} -Cext/gsl extconf.rb || die
 }
 
 each_ruby_compile() {
-	emake -Cext V=1
-	cp ext/*$(get_modname) lib/ || die
+	emake -Cext/gsl V=1
+	cp ext/gsl/*$(get_modname) lib/gsl || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index f8e7934b8c8c..b52f8f09479c 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,2 +1,3 @@
 DIST rb-inotify-0.9.0.gem 13312 SHA256 3fc925989db3e897e5e0aa9ef89ff511e8485f21cd7a90c2b4f390fcfc581623 SHA512 83d10102e9c3e55a5387f92bf1926ca26da99a3321dff0123f33ac38eb0dfa3fc416ec37abc3ed53ee1a201655a447a8c8e066859b344967c1c09370311c1abe WHIRLPOOL 6f09acb5e6a537854b23d5e6c046ba73a21b940a03bc91d5a2ccff860152e20c3ee8287326254895ab96dece2965c28a906eccd9e5a9d09988e3ecb34d1fc3e2
 DIST rb-inotify-0.9.3.gem 13312 SHA256 fd8ba8d602635880fe512f53e492d8d24f7baecfac58f967c1faae99a186e9d4 SHA512 d65cebf0bd4bead7f42e8f1b426627b2fbba3657b963a538dcb3f470e4225f728faa3788f831c19ff265e57f1ba2f059bc3c312079f4cceb6462a31fcb5456ec WHIRLPOOL 0a241fee31b1bb05f3e158f10c7aff67f2cec670d7e4fed67dd413da70919cb6ab9a7221a9fe3744255162b4c2d41a68c6ded9d7c16f703b7f879ddc7e93aadd
+DIST rb-inotify-0.9.4.gem 14336 SHA256 fa2e60949544f729ca3712ec15ccf0f0b23ab3dfa630e30e7c619e256c148a12 SHA512 87dc892cfecc36e93efc74a1056af20d511f10a40f99f0e8af45374a98ce4073e1e2805d7bcb54dba26db6b6eada5230cbb485deb5ade89f3e3c874e94cc2250 WHIRLPOOL 697d3ce71e77220a42e6ae46020d6e317d53895dad6e0679dd16cf3755e35c8fa8b26018532ab7a71a987e1ef2fceb61fab3f580b5bd5b1cc035fcbd97387348
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.4.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.4.ebuild
new file mode 100644
index 000000000000..16d4fec47a25
--- /dev/null
+++ b/dev-ruby/rb-inotify/rb-inotify-0.9.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-inotify/rb-inotify-0.9.4.ebuild,v 1.1 2014/05/03 09:28:11 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC="yard"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+RUBY_FAKEGEM_GEMSPEC="rb-inotify.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A thorough inotify wrapper for Ruby using FFI."
+HOMEPAGE="https://github.com/nex3/rb-inotify"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ffi"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on jeweler.
+	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
+
+	# Remove mandatory markup processor from yard options, bug 436112.
+	sed -i -e '/maruku/d' .yardopts || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# jruby has a native implementation and should not list ffi
+			# in the gemspec.
+			sed -i -e '/ffi/d' rb-inotify.gemspec || die
+			;;
+		*)
+			;;
+	esac
+}
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 0c35355f0cf4..1e7be24a2577 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,3 +1,4 @@
 DIST gettext-2.3.3.gem 204288 SHA256 fa9c6ed2484734389f4b1968f22942173fe381a6b673155eb52de24d212420f9 SHA512 c6859e3b5a37c042fac61afd09f0b89c738b712f5b1a22a3e85cd97a6d5ef94b5b942aa606843b9bdc457de6371615646dba5b86e61af2078138a9eb0b89b157 WHIRLPOOL 3b8d8e07387098f02fe8c1d36a21ec57ce8f3a3b2f0cb371b31244d7b8c2ed6effb403a33d6d7b15ad5ff5a1a713addb6b36661538c61641ff6e64847884aa72
 DIST gettext-2.3.8.gem 215040 SHA256 70775331c6a71225d73beb4221b6efdc69600b4d1d8c509b2a4ddb77f750e36e SHA512 5ffbb95d28c03fbf6158c2dc5ee5121c779843a41a2f1416a292a75095760f17a230a81a6a83588b4e50795d76796d01c16ff0e0d412c62e655fd4f0b5a33fea WHIRLPOOL eb1a5ab6fe1dc5d7d12e2c61d7daae37c1ab3de10fc8978b63d6c80eb9805d9d49ecae5cdfbcd9e040a8a2b9ee93cbb1db7237b0894b022a22f8b419a1f2d99f
 DIST gettext-3.1.1.gem 221184 SHA256 323a1b07db0863e032436f6935a0e63a5ab7475ac8c387d2632065ee7bafc12a SHA512 b59462fd5c75aa64c1671fd54248ff86325be9aa53df2b4e720e663ae04d40febe83205c6ec75f6200dcf75abfdefe23db1effe838dc1149154457acc2fadc05 WHIRLPOOL 445999cff5241654252073b027388b058f272ffbaaa7d844208908996275cc22ed15c7055bd99a89977737192e60af84e0539bd6461b2da748bf97d41d5744f3
+DIST gettext-3.1.2.gem 224768 SHA256 1ed987d0a46448cfc76617b486ad9a991e0d48501855e49eacb781aa531df6eb SHA512 14fbccf1d853bd58ae3ecbda3188294147404fb8473a54caeac505b93ffa25f96098786bd1171449aa1f0f74c4116e93b5d2f7c0705930dd014b210720667479 WHIRLPOOL 5a31bf87b38370276bf4c61886025f8721a7cb297012fbe6d1947abf82d1d35d779838506f5e56adbdda090a0ae20d4e5c74b9c4a08a4c782998d78b3a7c1768
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild
new file mode 100644
index 000000000000..7e3ceb3eff22
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild
@@ -0,0 +1,63 @@
+# 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.1 2014/05/03 13:02:03 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="po"
+
+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"
+IUSE="doc test"
+SLOT="0"
+LICENSE="Ruby"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 dev-ruby/text"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r samples
+}
diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest
index 28738d2a76de..3481da24a97c 100644
--- a/dev-ruby/ruby-shadow/Manifest
+++ b/dev-ruby/ruby-shadow/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-shadow-2.1.4.gem 8192 SHA256 6dfa7f71cc80716c5a150d1f059c37be62a7a349bbcebb55b4468291817b8983 SHA512 389c77a46da7be3a72fa7a9bf13dff3fccc3611543e88d46d916c713c6efb077d543b10bb5bd902d19b1d3b7d7bdcd70a6492fe7e8f375aad13423aeb7141c8d WHIRLPOOL 483a5747942a935ac474e226f0571076bc720aae10c2efc78ff8d977123c115580b58dc5ee717ac5ea13ee9cc383dbc098357159f02d21cc08197cb67a114ada
 DIST ruby-shadow-2.3.3.gem 10752 SHA256 fe7a02e3b0fa35af8c267d3020a73361024ec49f56d150edf98e42e33d1e39a4 SHA512 e1265aef201e940da0dc302bca975206abfbcb6f6d5a8996aba478c03bea733fb77e09ae6cf073cea71d09a8e5fb4b1c266ec6da1de9fbe15d6b07e29418028e WHIRLPOOL 7ca17397292816d0a9f68176d266c1b1a7c19756e119c65aaaf44966efd466e15ae1983fba2ef6873ac3e38837eabe56d81f21da63b910226ffccb8772d4c405
+DIST ruby-shadow-2.3.4.gem 10752 SHA256 3742a3dbe1100276bde815e8ad8d54eb041d4085f3013a31deb5e038d12e93e8 SHA512 30a626638d09da34273ac414c1716ebecc6112328a72adabaf3f31c99717630f7499a33d3ddf106c533a90775604a8038ea270ec6afccbf88adb3a8be7f6025b WHIRLPOOL 3449a1206aa39f76a5021afbea1f94fe11a585e16f9a7a89e74da7bdba6dafc63f8d8874f239cb8d14399d01a4819e074930b647e4d9bcbf812cec37d4d458cd
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.3.4.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.3.4.ebuild
new file mode 100644
index 000000000000..4077d1ecac4d
--- /dev/null
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.3.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shadow/ruby-shadow-2.3.4.ebuild,v 1.1 2014/05/03 13:49:14 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="HISTORY README README.euc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="ruby shadow bindings"
+HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die "Configuration failed."
+	sed -i -e "/^ldflags  =/s/$/ \$(LDFLAGS)/" Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1
+	mkdir -p lib
+	cp shadow$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/sprockets/sprockets-2.2.2-r1.ebuild b/dev-ruby/sprockets/sprockets-2.2.2-r1.ebuild
index 64287fa5c555..0d8c4c663411 100644
--- a/dev-ruby/sprockets/sprockets-2.2.2-r1.ebuild
+++ b/dev-ruby/sprockets/sprockets-2.2.2-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-ruby/sprockets/sprockets-2.2.2-r1.ebuild,v 1.2 2014/04/05 13:57:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets/sprockets-2.2.2-r1.ebuild,v 1.3 2014/05/04 13:18:51 mrueg Exp $
 
-EAPI=4
-USE_RUBY="ruby19"
+EAPI=5
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/termcolor/Manifest b/dev-ruby/termcolor/Manifest
index a806a2ea35a4..bb5ce3047d06 100644
--- a/dev-ruby/termcolor/Manifest
+++ b/dev-ruby/termcolor/Manifest
@@ -1 +1,2 @@
 DIST termcolor-1.2.1.gem 6656 SHA256 d5e595a8d29380d76b44e5e3806766198da048095acc51072b388ea5439e1df3 SHA512 986fe5a5a56a83d9a39ce13cfe59a82850780befdbba006d2d0cf532b9bf2f72f1fe70363123c46b8beead5d8add452535189a069f2b2f3cf62f0b7611ec52ff WHIRLPOOL 3d12c46f22b53ec2df15d55673ebe78ad98248deabdb5adc655908774edf30f3ac90f5210bd994dd4997c8017a9e2e11d5a705ab3679ff689c9d3b9df702b865
+DIST termcolor-1.2.2.gem 7168 SHA256 9c07f618211d20b43fe2d06ca5815d8c5c13f20b2ed87b67e815ad39869cb5f4 SHA512 1709c6ce299a320209288cc27fb1e8f80492e582b84be2e54f3a09b96c1d2e048760b8f72e19581bd8bc6c1539c34ac010cb3e7bec4a7c24909eff438639182e WHIRLPOOL 66a0ee0b282898e08bbf557d815177afd4fc6d784da18b66d9a843e2d154def90e09f6135455a1eab7423c9ab3c9cbc752c7e259a10029b3c836bef013f6d433
diff --git a/dev-ruby/termcolor/termcolor-1.2.2.ebuild b/dev-ruby/termcolor/termcolor-1.2.2.ebuild
new file mode 100644
index 000000000000..f1d618bcc325
--- /dev/null
+++ b/dev-ruby/termcolor/termcolor-1.2.2.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/termcolor/termcolor-1.2.2.ebuild,v 1.1 2014/05/04 06:55:26 graaff Exp $
+
+EAPI=5
+
+#*** Using highline effectively in JRuby requires manually installing the ffi-ncurses gem.
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a library for ANSI color formatting like HTML for output in terminal"
+HOMEPAGE="http://termcolor.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/highline-1.5.0"
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
new file mode 100644
index 000000000000..31d2098f45c8
--- /dev/null
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild
@@ -0,0 +1,28 @@
+# 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.1 2014/05/03 12:45:04 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RR adapter for Test::Unit."
+HOMEPAGE="http://rubyforge.org/projects/test-unit/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/thread_safe/Manifest b/dev-ruby/thread_safe/Manifest
index 52c970e1e7d9..98e44f8ffa82 100644
--- a/dev-ruby/thread_safe/Manifest
+++ b/dev-ruby/thread_safe/Manifest
@@ -1,4 +1,2 @@
-DIST thread_safe-0.1.3.gem 136704 SHA256 f8b9f8db0889aa97676b4a1efe919b1e76601ed9c9662a986825755bba305c38 SHA512 ef54d618a3de34716705d23081dbc325031be33dd6819f28b3601bbc62da4c79d4ae0c5dcad5490efa25f998184509b672be3b6f223fbfc9505d64a7c217c3cb WHIRLPOOL 5ea88ad1b8f15d9472b5d5eeaf21c9e23f85d50381ace20d4243ff19165dde80ac95d3f9990a95d88614d15b2d7828ddc7acd37e5a39c34008c7a3a0a97459b2
-DIST thread_safe-0.2.0.gem 117248 SHA256 a85f7f14c3269fd6c77514aa4fdeef20bef19eee91839762b3b4a4f8cf323145 SHA512 55743c6d20ced484918801d44cddff224e94ef07a7f720932f9c8354f85490a4c35ac73595490d32ab4f70b6659295905f2138ef03bd6696c76fc3f3461eec51 WHIRLPOOL 3b4d8004e4a7377449ac1fa58f2fbd4f27af5e2ceb276233c05c396839cf41f48e4e5ca0d3f6482a001de48fd0968e60ae156a7c1bce922cbaeb3ca205655bd1
 DIST thread_safe-0.3.1.gem 117248 SHA256 aff0cf52e87876f46767c5327b8c4332381c6f6f832dff36679e928c30b82f3d SHA512 761e24e33b0a77d480d775fa69e0d0810b5c09fa93f72d92b53a4573f5c16e801b7e5e593228e7ff02b1183ab8e2cce794f4edd1454fc610862857981c098cb6 WHIRLPOOL e34a28203d83edc9e08f8adc8e6d185d30c5224e773df9d301dc38c5a5af425a90234abaf2eb18e8ea1d3d8ef345446d8b24d378ebe9c291cfe625387f04cc36
 DIST thread_safe-0.3.3.gem 117248 SHA256 f0f4307ea85d6eff7f9c304587073e3465da58beb198ea686bf69ec87f2ddb7e SHA512 332d37f9e6d848a5a04ec1c740f38d4d33e70fb00f574f5fe910c51bf6c9ee8122b7fc30a03aed0beba0bd730766c5c833332b2636d2dbede30ed396c53b6666 WHIRLPOOL 96c44813b975dde5de8aaddd86b1e3e1173a69e88227dc5b5befcc6239cca338f2422078a653c5693a4c4a1e5a09625ab79333d62d900c21cd205cf2521d404c
diff --git a/dev-ruby/thread_safe/thread_safe-0.1.3-r1.ebuild b/dev-ruby/thread_safe/thread_safe-0.1.3-r1.ebuild
deleted file mode 100644
index 77216f84753e..000000000000
--- a/dev-ruby/thread_safe/thread_safe-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/thread_safe/thread_safe-0.1.3-r1.ebuild,v 1.4 2013/12/08 16:27:23 johu Exp $
-
-EAPI=5
-# jruby → there is code for this in ext but that requires compiling java.
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A collection of thread-safe versions of common core Ruby classes"
-HOMEPAGE="https://github.com/headius/thread_safe"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/atomic"
-
-each_ruby_prepare(){
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/thread_safe/thread_safe-0.1.3-r2.ebuild b/dev-ruby/thread_safe/thread_safe-0.1.3-r2.ebuild
deleted file mode 100644
index a14a0f650e81..000000000000
--- a/dev-ruby/thread_safe/thread_safe-0.1.3-r2.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/dev-ruby/thread_safe/thread_safe-0.1.3-r2.ebuild,v 1.1 2014/01/04 16:54:35 mrueg Exp $
-
-EAPI=5
-# jruby → there is code for this in ext but that requires compiling java.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A collection of thread-safe versions of common core Ruby classes"
-HOMEPAGE="https://github.com/headius/thread_safe"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/atomic"
-
-each_ruby_prepare(){
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/thread_safe/thread_safe-0.2.0.ebuild b/dev-ruby/thread_safe/thread_safe-0.2.0.ebuild
deleted file mode 100644
index a177943b4972..000000000000
--- a/dev-ruby/thread_safe/thread_safe-0.2.0.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/dev-ruby/thread_safe/thread_safe-0.2.0.ebuild,v 1.1 2014/02/28 06:54:33 graaff Exp $
-
-EAPI=5
-# jruby → there is code for this in ext but that requires compiling java.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A collection of thread-safe versions of common core Ruby classes"
-HOMEPAGE="https://github.com/headius/thread_safe"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/atomic-1.1.7"
-
-each_ruby_prepare(){
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 453ce45b1241..47cd4201e3d2 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1 +1,2 @@
 DIST timecop-0.6.0.gem 14336 SHA256 63d923f738e1a942409c045815477b1e93252f30a3db2abe22c1f4b6cdb518ee SHA512 121406b8c370cd7cc52d1c4a691f461ad1ce4eb3cb37f82f0af0e92335159041a621684188e5e3436b3a85f66c6057d6ed72f3cd6c651195ae2c61b690e78255 WHIRLPOOL e8cb382ee792f0acad788464f53a13380b6a92b85ff658c85279d9066af5bee94ffe7628ab2067da0da0dea838a738eb176c5f5c93960bb9cb05ae0f2e5f3d07
+DIST timecop-0.7.1.gem 15360 SHA256 22e529f06739b1361b4e3b40adc667dfa8f50e66b13b778448cf51fb62bc8f2a SHA512 cbc1e1d6575473ed4200e71a8bbc91f4dd78a0e612e08ca236f485a92e71f02621bd199dc32a983dd7eea9a143b8fbf4b833f73016b5a7ea6a7459730efc1d83 WHIRLPOOL f54018f65fdd55c8d7399083a7c9d1f6f1405a6cea5941b8e20ef143d3c4a57350cc2714a2626f918ff753a11dafb506539d41ef4c43464258a2832590215a2a
diff --git a/dev-ruby/timecop/timecop-0.7.1.ebuild b/dev-ruby/timecop/timecop-0.7.1.ebuild
new file mode 100644
index 000000000000..f8e51dd71d9b
--- /dev/null
+++ b/dev-ruby/timecop/timecop-0.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/timecop-0.7.1.ebuild,v 1.1 2014/05/04 07:05:35 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
+HOMEPAGE="http://github.com/jtrupiano/timecop"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
+	sed -i -e '/rubygems/ a\gem "test-unit"' test/test_helper.rb || die
+}
+each_ruby_prepare() {
+	sed -i -e "/bin\/sh/ a\RUBY='${RUBY}'" test/run_tests.sh || die
+}
diff --git a/dev-ruby/turbolinks/Manifest b/dev-ruby/turbolinks/Manifest
index f65d95e66733..1f3dfd3674f9 100644
--- a/dev-ruby/turbolinks/Manifest
+++ b/dev-ruby/turbolinks/Manifest
@@ -1 +1,2 @@
 DIST turbolinks-2.1.0.gem 16384 SHA256 02e20144f748f3ad5de63097bba212c2f69ff2e6d126397888c7841392623946 SHA512 81e13e1a06c3eab836abacb34bd53d279ea612f3d801fcf95ef53bc612e4ae38414ff4924c96ceecb1a52f2ab1c84405687bf0d4057467fcfdfc6aff815cbeba WHIRLPOOL d6194e1c49fc90999d095f71dc1e823ed482a709c1030fb6d95462b4a0e6630f2e245d229d55ff2ea904e4266bad6ad378652593ea375bec65dca076aa024149
+DIST turbolinks-2.2.2.gem 18944 SHA256 64d999fa191ed4bd9a52dfa4d5a268c3682801ca41b8d85c912c292e0b67c471 SHA512 87f53c77ee23454f03d74790f8e503a31c39c35f45f957fe00528ed187fd42adc9b2d12313b9b4bcc1449a83b5760a219cda2e04420911dfed6a867d20f03dc7 WHIRLPOOL d91342209bc23fdbed2f2731a29eb738ba1aacabb233fe9932cb9e74cd5482bc7985d29e460c670e903a2c6be586fbc4e647545e909998bf87f00a19cf8d2d09
diff --git a/dev-ruby/turbolinks/turbolinks-2.2.2.ebuild b/dev-ruby/turbolinks/turbolinks-2.2.2.ebuild
new file mode 100644
index 000000000000..bdce51b6d3e2
--- /dev/null
+++ b/dev-ruby/turbolinks/turbolinks-2.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/turbolinks/turbolinks-2.2.2.ebuild,v 1.1 2014/05/04 07:21:01 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# The gem does not contain runnable tests.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes following links in your web application faster"
+HOMEPAGE="https://github.com/dkubb/equalizer"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/coffee-rails"
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.6-r2.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..e7790b3246bc
--- /dev/null
+++ b/dev-ruby/unf_ext/unf_ext-0.0.6-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf_ext/unf_ext-0.0.6-r2.ebuild,v 1.1 2014/05/03 06:47:20 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Unicode Normalization Form support library for CRuby"
+HOMEPAGE="http://sourceforge.jp/projects/unf/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.1-r1
+		dev-ruby/shoulda
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/unf_ext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/unf_ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
+	cp ext/unf_ext/*$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 test/test_*.rb
+}
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
index a8ce88818f6f..b0a797e0174e 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.1.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-util/appdata-tools/appdata-tools-0.1.7.ebuild,v 1.3 2014/03/07 16:14:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild,v 1.4 2014/05/03 14:22:07 maekke Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hughsie/appdata-tools/"
 SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="nls"
 RDEPEND=">=dev-libs/glib-2.14
 	>=net-libs/libsoup-2.4
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 72489692a3cd..227f6167e603 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1 +1,2 @@
 DIST colm-0.11.tar.gz 954781 SHA256 2fd80148b3b408b0ce261b6a248005c314b54120f9f9f80d5564056801718187 SHA512 46e7d7d87d2f8d156e15771851564540bce98eba2cf6cf14ac9af8e4f451eeda4b6cb8ea269c3a22dd096d6f12f7d3417410f51334979b331cfd3890598d959f WHIRLPOOL 57576de59500fd12661291bd17c6ae09105a5394c10315de33a1f830ff2fe54f77aa49290cc511c41dba432ffd1acde2a4d9add77c65edb7ee686e314d33785f
+DIST colm-0.12.0.tar.gz 983143 SHA256 7b545d74bd139f5c622975d243c575310af1e4985059a1427b6fdbb1fb8d6e4d SHA512 febdd750f728acc608e405f875fbc09880ddfb6cf593c05b129c4253f235e535cee2ebf89c45fabcf911dd9b77b204f8c6e463b6e307b0d062b7ecf864f47398 WHIRLPOOL 083d66607a898d5df42ee742d85dd83d893487a8f9c8aee5bef75e07d2f53c3371e683bf4947249bfcbc803a3bc643cc9d87532e36d5e656b12db9059d7335f6
diff --git a/dev-util/colm/colm-0.12.0.ebuild b/dev-util/colm/colm-0.12.0.ebuild
new file mode 100644
index 000000000000..bd0151959737
--- /dev/null
+++ b/dev-util/colm/colm-0.12.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/colm/colm-0.12.0.ebuild,v 1.1 2014/05/03 06:00:23 patrick Exp $
+
+EAPI=5
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="http://www.complang.org/colm/"
+SRC_URI="http://www.complang.org/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.20.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.20.ebuild
index dd1c712d8c29..c98eb8ec1b28 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.20.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.20.ebuild
@@ -1,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/gtk-doc-am/gtk-doc-am-1.20.ebuild,v 1.12 2014/04/21 10:29:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/gtk-doc-am-1.20.ebuild,v 1.13 2014/05/03 15:56:03 vapier Exp $
 
 EAPI=5
 GNOME_ORG_MODULE="gtk-doc"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6"
diff --git a/dev-vcs/fossil/fossil-20130911114349.ebuild b/dev-vcs/fossil/fossil-20130911114349.ebuild
index 1be24ecd8cdc..9c82f47117d7 100644
--- a/dev-vcs/fossil/fossil-20130911114349.ebuild
+++ b/dev-vcs/fossil/fossil-20130911114349.ebuild
@@ -1,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/fossil/fossil-20130911114349.ebuild,v 1.2 2014/04/18 19:52:36 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/fossil-20130911114349.ebuild,v 1.3 2014/05/04 08:25:03 ago Exp $
 
 EAPI=5
 MY_P=${PN}-src-${PV}
@@ -13,7 +13,7 @@ SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="json +lineedit sqlite +ssl tcl"
 
 DEPEND="sys-libs/zlib
diff --git a/eclass/leechcraft.eclass b/eclass/leechcraft.eclass
index 55508f82eaed..829dc0c7717d 100644
--- a/eclass/leechcraft.eclass
+++ b/eclass/leechcraft.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.14 2014/04/15 16:06:56 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.15 2014/05/03 21:25:46 pinkbyte Exp $
 #
 # @ECLASS: leechcraft.eclass
 # @MAINTAINER:
@@ -42,11 +42,7 @@ else
 fi
 
 HOMEPAGE="http://leechcraft.org/"
-if version_is_at_least 0.5.95; then
-	LICENSE="Boost-1.0"
-else
-	LICENSE="GPL-3"
-fi
+LICENSE="Boost-1.0"
 
 # @ECLASS-VARIABLE: LEECHCRAFT_PLUGIN_CATEGORY
 # @DEFAULT_UNSET
@@ -72,13 +68,11 @@ EXPORT_FUNCTIONS "pkg_pretend"
 leechcraft_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if version_is_at_least 0.5.85; then
-		# 0.5.85 and later requires at least gcc 4.6
-		if [[ ${MERGE_TYPE} != binary ]]; then
-			[[ $(gcc-major-version) -lt 4 ]] || \
-					( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-				&& die "Sorry, but gcc 4.6 or higher is required."
-		fi
+	# 0.5.85 and later requires at least gcc 4.6
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+			&& die "Sorry, but gcc 4.6 or higher is required."
 	fi
 	if version_is_at_least 0.6.66 || ( [[ ${PN} == lc-monocle ]] && version_is_at_least 0.6.65 ); then
 		# 0.6.65 monocle and all later plugins require at least gcc 4.8
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index b8cf3658d052..e6872e01bffe 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -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/eclass/vala.eclass,v 1.7 2013/10/04 22:11:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.8 2014/05/04 06:13:55 tetromino Exp $
 
 # @ECLASS: vala.eclass
 # @MAINTAINER:
@@ -26,13 +26,13 @@ esac
 
 # @ECLASS-VARIABLE: VALA_MIN_API_VERSION
 # @DESCRIPTION:
-# Minimum vala API version (e.g. 0.16).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.10}
+# Minimum vala API version (e.g. 0.18).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.18}
 
 # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
-# Maximum vala API version (e.g. 0.20).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.22}
+# Maximum vala API version (e.g. 0.22).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.24}
 
 # @ECLASS-VARIABLE: VALA_USE_DEPEND
 # @DEFAULT_UNSET
diff --git a/games-action/phobiaii/Manifest b/games-action/phobiaii/Manifest
index 6c7e848ed954..a32623e1c99b 100644
--- a/games-action/phobiaii/Manifest
+++ b/games-action/phobiaii/Manifest
@@ -1 +1 @@
-DIST linuxphobia-1.1-i386.tar.bz2 7709686 SHA256 f70b66a919d04e828d0c2e3e84f7e90659dd6891cbadfe66413298c5db7c87af
+DIST linuxphobia-1.1-i386.tar.bz2 7709686 SHA256 f70b66a919d04e828d0c2e3e84f7e90659dd6891cbadfe66413298c5db7c87af SHA512 c8a799eb1e9b25781ef37487951b4213be29a60613bb2455df44e484e3553f153e5872aa97c70286eaf64ba78c621941318f702e5dc680a5442728866d2f7a1d WHIRLPOOL 42f23f89134e9635d217b3572ce85cfafecf2bacc759c0a938e1675e3ab6775be311e083df2409db4732c938a76af807e7659d130f79423c922aa2779f83d96c
diff --git a/games-action/phobiaii/phobiaii-1.1.ebuild b/games-action/phobiaii/phobiaii-1.1.ebuild
index e0b4e98a23b7..83e4e73ee03b 100644
--- a/games-action/phobiaii/phobiaii-1.1.ebuild
+++ b/games-action/phobiaii/phobiaii-1.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/games-action/phobiaii/phobiaii-1.1.ebuild,v 1.16 2012/09/24 00:22:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaii/phobiaii-1.1.ebuild,v 1.17 2014/05/03 07:57:19 ulm Exp $
 
 inherit eutils games
 
@@ -9,7 +9,7 @@ DESCRIPTION="Just a moment ago, you were safe inside your ship, behind five inch
 HOMEPAGE="http://www.lynxlabs.com/games/linuxphobia/index.html"
 SRC_URI="http://www.lynxlabs.com/games/linuxphobia/${MY_P}-i386.tar.bz2"
 
-LICENSE="as-is"
+LICENSE="freedist"		#505612
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/games-arcade/digger/Manifest b/games-arcade/digger/Manifest
index 9e19390675e7..6063f303195a 100644
--- a/games-arcade/digger/Manifest
+++ b/games-arcade/digger/Manifest
@@ -1,2 +1,2 @@
-DIST digger-20020314.tar.gz 108712 SHA256 e45cb1c5b67fba2fa1b768d1ed75153a64f82e73544c3d98eaf2c37b1dbefdc7
+DIST digger-20020314.tar.gz 108712 SHA256 e45cb1c5b67fba2fa1b768d1ed75153a64f82e73544c3d98eaf2c37b1dbefdc7 SHA512 755473da48b6211bbf31200e8cbb47d8fb16b115fe40ed9e1c2a7029839dad0ce6dd99a1c37a57ac317d8472a0bf5f9afe167a4fd3cce14b6786a36db86cdc1f WHIRLPOOL 2ad2de4b21c583a899cd64fb7f15de28e921e1c44e1de6cf7726b2ad7a26728ee8f5f1de024c03cd107ff2887e636207c463e52816879de8af4edf60038c29f7
 DIST digger-20140423.tar.gz 117375 SHA256 44a77e1b88409f7427bd2958d1f18648b18a1e9631d0e78fee90957e5ad5cfa0 SHA512 9277c6dc4d7f74aeede379b42aeeef881d8fd927ef0e6f6c0e1a5f76be257244c4353758557209647812b942d215dd992939b190ef11f854b41ee2ceaab7eece WHIRLPOOL 15d08563b32e766f8f18888136c004a263a1951ea56f4d0a666d222cad966d8647f3d4ecebfa2d960fc6b0ae7fdf8538c7bfe432f03baec4352d0a99f676437b
diff --git a/games-arcade/digger/digger-20020314.ebuild b/games-arcade/digger/digger-20020314.ebuild
index 05cf21bb6073..3119b0d8a828 100644
--- a/games-arcade/digger/digger-20020314.ebuild
+++ b/games-arcade/digger/digger-20020314.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/digger/digger-20020314.ebuild,v 1.13 2010/09/22 07:10:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/digger/digger-20020314.ebuild,v 1.14 2014/05/03 18:44:09 ulm Exp $
 
 EAPI=2
 inherit eutils games
@@ -9,10 +9,11 @@ DESCRIPTION="Digger Remastered"
 HOMEPAGE="http://www.digger.org/"
 SRC_URI="http://www.digger.org/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
+RESTRICT="mirror bindist"
 
 DEPEND="media-libs/libsdl[video]"
 
diff --git a/games-emulation/xe/Manifest b/games-emulation/xe/Manifest
index 8a18fbfd5032..c9dab135cb24 100644
--- a/games-emulation/xe/Manifest
+++ b/games-emulation/xe/Manifest
@@ -1,2 +1,2 @@
 DIST xe-x86-32-bin.2.16.2.tar.bz2 1610395 SHA256 fff82a9e56d8f03d14395eeebb9306de7b3a03df6af12b0acc11b0206d1212f0 SHA512 b73f79854f860f7e7060c8b09e0a038b787762d3bd440b5b2825b5a702e4f32c788b883012728813e0a9dcee779f8b98b807c8af3f655fea21bd0ed1383e361c WHIRLPOOL 0c6c18c53105859ec44767cbc21fdf82e14ea4532fe26ecf9dec2acc6917af2baa80df7d8050ce9206ad189a2d8ac5cad1b17c7daa86d69ebcc04b4e83d1cabf
-DIST xe-x86-64-bin.2.16.2.tar.bz2 2141614 SHA256 73a035c20b56fe197529aeb034ce3b81c680e184d0acca7d48df7fedbbafb103
+DIST xe-x86-64-bin.2.16.2.tar.bz2 2141614 SHA256 73a035c20b56fe197529aeb034ce3b81c680e184d0acca7d48df7fedbbafb103 SHA512 cf8a4be4f169660138018631b4a2b6c1a42850c7fc08bd9bd184ab054bffc6fe00197baaf9628cce87608628bb33db0dabac97debd7c53466b086cf0805cc5d8 WHIRLPOOL 49a8f159e34bb3a2c4e44130f6b2c68e3dc681f8795f776c9323c0e2d21180fa490dc810abab327f5573c0cfd71307c1c4d16abaf0775795949c5af244b8831c
diff --git a/games-emulation/xe/xe-2.16.2.ebuild b/games-emulation/xe/xe-2.16.2.ebuild
index fb7beacc074b..5e512ee880e7 100644
--- a/games-emulation/xe/xe-2.16.2.ebuild
+++ b/games-emulation/xe/xe-2.16.2.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/games-emulation/xe/xe-2.16.2.ebuild,v 1.5 2012/12/21 07:53:22 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xe/xe-2.16.2.ebuild,v 1.6 2014/05/03 18:31:53 ulm Exp $
 
 EAPI=4
 inherit games
@@ -10,11 +10,11 @@ HOMEPAGE="http://www.xe-emulator.com/"
 SRC_URI="amd64? ( http://www.xe-emulator.com/files/${PN}-x86-64-bin.${PV}.tar.bz2 )
 	x86? ( http://www.xe-emulator.com/files/${PN}-x86-32-bin.${PV}.tar.bz2 )"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="mirror bindist strip"
 
 RDEPEND="x11-libs/libXv
 	x11-libs/libXinerama
diff --git a/games-fps/eduke32/eduke32-20131119.4169.ebuild b/games-fps/eduke32/eduke32-20131119.4169.ebuild
index 393097ef7404..e4e5f012bbae 100644
--- a/games-fps/eduke32/eduke32-20131119.4169.ebuild
+++ b/games-fps/eduke32/eduke32-20131119.4169.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-fps/eduke32/eduke32-20131119.4169.ebuild,v 1.1 2013/11/22 19:44:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20131119.4169.ebuild,v 1.2 2014/05/04 13:38:39 hasufell Exp $
 
 # TODO/FIXME:
 # lunatic broken
@@ -114,6 +114,7 @@ src_compile() {
 		LINKED_GTK=1
 		CPLUSPLUS=0
 		SDL_TARGET=1
+		F_JUMP_TABLES=""
 		$(usex gtk "WITHOUT_GTK=0" "WITHOUT_GTK=1")
 		$(usex debug "DEBUGANYWAY=1" "DEBUGANYWAY=0")
 		$(usex x86 "NOASM=0" "NOASM=1")
diff --git a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild b/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild
index ac013ad1498f..ef8140b73efb 100644
--- a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild
+++ b/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.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-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild,v 1.5 2013/01/17 07:13:42 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild,v 1.6 2014/05/03 10:03:13 ulm Exp $
 
 inherit eutils unpacker games
 
@@ -10,13 +10,12 @@ DESCRIPTION="turn-based 2D medieval combat"
 HOMEPAGE="http://www.lokigames.com/products/heroes3/"
 SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
-
 # Should also work on ppc
 KEYWORDS="~amd64 x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="mirror bindist strip"
 
 DEPEND="games-util/loki_patch"
 RDEPEND=">=sys-libs/lib-compat-loki-0.2
diff --git a/games-strategy/uqm/uqm-0.7.0-r2.ebuild b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
index ec8dda4523c9..ef9ec373aa64 100644
--- a/games-strategy/uqm/uqm-0.7.0-r2.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r2.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/games-strategy/uqm/uqm-0.7.0-r2.ebuild,v 1.4 2012/11/22 10:08:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.7.0-r2.ebuild,v 1.5 2014/05/04 14:53:50 hasufell Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs games
@@ -65,7 +65,7 @@ src_prepare() {
 
 	# respect CC
 	sed -i \
-		-e 's/PROG_gcc_FILE="gcc"/PROG_gcc_FILE="'$(tc-getCC)'"/' \
+		-e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
 		build/unix/config_proginfo_build \
 		|| die "sed config_proginfo_build failed"
 }
diff --git a/gnome-base/gconf/gconf-3.2.6-r2.ebuild b/gnome-base/gconf/gconf-3.2.6-r2.ebuild
index 721c31c05bb9..f78df368ef74 100644
--- a/gnome-base/gconf/gconf-3.2.6-r2.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-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/gnome-base/gconf/gconf-3.2.6-r2.ebuild,v 1.1 2014/04/05 07:48:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r2.ebuild,v 1.3 2014/05/04 12:09:58 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -16,7 +16,7 @@ HOMEPAGE="http://projects.gnome.org/gconf/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="debug +introspection ldap policykit"
 
 RDEPEND="
diff --git a/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild b/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
index 93d2f304bb91..e2fea0984293 100644
--- a/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.10.0.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/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild,v 1.4 2014/04/27 01:46:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild,v 1.6 2014/05/04 12:10:05 pacho Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
@@ -22,7 +22,7 @@ LICENSE="
 
 SLOT="0"
 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test xinerama"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild
index 287ad6608240..32ff2418c547 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.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/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild,v 1.1 2014/04/20 15:05:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild,v 1.3 2014/05/04 12:10:11 pacho Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ IUSE="+games +shotwell +tracker"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
index b27019331b9a..7b782bba55c2 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.10.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/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v 1.3 2014/05/01 02:31:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v 1.5 2014/05/04 12:10:18 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+bluetooth +i18n +networkmanager -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
diff --git a/gnome-base/gvfs/gvfs-1.18.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.18.3-r1.ebuild
index fc64bb7cb96f..be6efd3a51d5 100644
--- a/gnome-base/gvfs/gvfs-1.18.3-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.18.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/gnome-base/gvfs/gvfs-1.18.3-r1.ebuild,v 1.1 2014/04/26 18:42:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.18.3-r1.ebuild,v 1.3 2014/05/04 12:10:25 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	udisks? ( udev )
 	systemd? ( udisks )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Can use libgphoto-2.5.0 as well. Automagic detection.
 RDEPEND="
diff --git a/gnome-base/libglade/libglade-2.6.4-r1.ebuild b/gnome-base/libglade/libglade-2.6.4-r1.ebuild
index 7169f1a6ad2f..5849e2f6f28f 100644
--- a/gnome-base/libglade/libglade-2.6.4-r1.ebuild
+++ b/gnome-base/libglade/libglade-2.6.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/gnome-base/libglade/libglade-2.6.4-r1.ebuild,v 1.3 2014/05/02 13:07:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4-r1.ebuild,v 1.5 2014/05/04 12:13:27 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://library.gnome.org/devel/libglade/stable/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-base/librsvg/librsvg-2.40.2.ebuild b/gnome-base/librsvg/librsvg-2.40.2.ebuild
index 6970097a7aec..5ffb63335cf8 100644
--- a/gnome-base/librsvg/librsvg-2.40.2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.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/gnome-base/librsvg/librsvg-2.40.2.ebuild,v 1.2 2014/05/02 13:03:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.40.2.ebuild,v 1.4 2014/05/04 12:10:30 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+introspection vala tools"
 REQUIRED_USE="
 	vala? ( introspection )
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild
index ba83e89aa0d7..dcca73678025 100644
--- a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild
@@ -1,11 +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/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild,v 1.3 2013/12/08 18:40:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild,v 1.4 2014/05/04 05:02:29 tetromino Exp $
 
 EAPI=5
 
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.10"
+VALA_MAX_API_VERSIOn="0.22" # build fails with vala-0.24
 WANT_AUTOMAKE=1.13
 
 inherit autotools eutils gnome2 vala versionator
diff --git a/gnome-extra/evolution-kolab/Manifest b/gnome-extra/evolution-kolab/Manifest
deleted file mode 100644
index 7d2d7329a4f2..000000000000
--- a/gnome-extra/evolution-kolab/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST evolution-kolab-3.8.1.tar.xz 670436 SHA256 a7efb305e81131a795b294e6de04e7d6d76396883ff7a855bb74acc92a3ee580 SHA512 74d6144f1fb007b5e6f8a6c82c3640dc05baa0f0526bf26faa3067f6b5c73aa63e513f6bb13f5b082616cbf34629a52ff49d98c10d9c05d2156b69cbefe96abf WHIRLPOOL 757b79627aac252e85e36dbacac634378afee17267ade361eeed77928643694d52944acff4bd60d7858efa7a8e4a81cce2dc3500a243d18e539e346b50790600
diff --git a/gnome-extra/evolution-kolab/evolution-kolab-3.8.1.ebuild b/gnome-extra/evolution-kolab/evolution-kolab-3.8.1.ebuild
deleted file mode 100644
index 8414a5c58460..000000000000
--- a/gnome-extra/evolution-kolab/evolution-kolab-3.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/evolution-kolab-3.8.1.ebuild,v 1.2 2013/11/30 19:16:47 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Evolution module for connecting to Kolab groupware servers"
-HOMEPAGE="https://live.gnome.org/Evolution/Kolab"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="" # kerberos (does nothing useful for now)
-
-RDEPEND="
-	>=mail-client/evolution-${PV}:2.0
-	=gnome-extra/evolution-data-server-${MY_MAJORV}*
-	>=dev-db/sqlite-3.7:3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libical-0.44
-	dev-libs/libxml2
-	dev-libs/nss
-	>=gnome-base/gconf-2:2
-	>=net-misc/curl-7.19[ssl]
-	>=x11-libs/gtk+-3.2:3
-"
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # test suite is non-functional
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# We do not want to install a "hello world" program.
-	epatch "${FILESDIR}/${PN}-3.4.3-no-hello-world.patch"
-
-	# Strip stupid cflags
-	sed -e 's/\(ADD_CFLAGS=.*\) -pedantic/\1/' \
-		-i configure.ac configure || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static --without-krb5 # --with-krb5 does nothing useful
-}
-
-src_install() {
-	gnome2_src_install
-	rm -rv "${ED}usr/doc" || die "rm failed"
-}
diff --git a/gnome-extra/evolution-kolab/files/evolution-kolab-3.4.3-no-hello-world.patch b/gnome-extra/evolution-kolab/files/evolution-kolab-3.4.3-no-hello-world.patch
deleted file mode 100644
index 06ffeea50b60..000000000000
--- a/gnome-extra/evolution-kolab/files/evolution-kolab-3.4.3-no-hello-world.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2a75e25ce2abbacd3c37f0a6ebd51e55d9f358d2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 13 Aug 2012 01:37:42 -0400
-Subject: [PATCH 1/2] Do not build 'Hello World' program
-
----
- src/Makefile.am |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 49b56fe..8188a11 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -10,10 +10,6 @@ SUBDIRS =		\
- 	eplugin		\
- 	tests
- 
--bin_PROGRAMS = evolution_kolab
--
--evolution_kolab_SOURCES = \
--	main.c
- 
- AM_CPPFLAGS = 					\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"	\
--- 
-1.7.8.6
-
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
new file mode 100644
index 000000000000..2b47ffa140db
--- /dev/null
+++ b/gnome-extra/gnome-commander/Manifest
@@ -0,0 +1 @@
+DIST gnome-commander-1.4.1.tar.xz 6263268 SHA256 ec57e81008a07bf4589bff8fe1ac519cb422016a8dc272d5ebf3d2441385d443 SHA512 13ea070d488220588965f2034a47451c6596418398d75ae8aa3cc43ab79a38466541bacb39c9de0230147da4cf9f339d9cd762516f03760957533f0ee9c18f70 WHIRLPOOL 074e62d83bc16890dc8522d8257c6d0fc9f4a8a4038e50c4e9874c7a2a348c3f5f66eaa7f72c4865bec5ad6967e1a261abc5916f7e22e05260d8d16d971ed9dd
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.4.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.4.1.ebuild
new file mode 100644
index 000000000000..3eba865dd8b9
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-commander/gnome-commander-1.4.1.ebuild,v 1.1 2014/05/03 22:29:26 hwoarang Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="A full featured, twin-panel file manager for Gnome2"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm doc exif gsf pdf python taglib"
+
+RDEPEND="app-text/gnome-doc-utils
+	>=dev-libs/glib-2.6.0:2
+	>=dev-libs/libunique-0.9.3:1
+	dev-util/meld
+	gnome-base/gnome-keyring
+	>=gnome-base/gnome-vfs-2.0.0
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.4.0
+	>=x11-libs/gtk+-2.8.0:2
+	chm? ( dev-libs/chmlib )
+	doc? ( app-text/scrollkeeper
+		gnome-extra/yelp )
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	pdf? ( >=app-text/poppler-0.18 )
+	python? ( >=dev-python/gnome-vfs-python-2.0.0 )
+	taglib? ( >=media-libs/taglib-1.4 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+src_configure() {
+	G2CONF="$(use_enable doc scrollkeeper)
+		$(use_enable python)
+		$(use_with chm libchm)
+		$(use_with exif exiv2)
+		$(use_with gsf libgsf)
+		$(use_with taglib)
+		$(use_with pdf poppler)"
+	gnome2_src_configure
+}
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
new file mode 100644
index 000000000000..53b83744b9fe
--- /dev/null
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>u.scholz83@gmx.de</email>
+    <name>Uwe Scholz</name>
+    <description>Proxy maintainer. Assign bugs to him.</description>
+  </maintainer>
+<upstream>
+  <maintainer status="active">
+    <email>u.scholz83@gmx.de</email>
+    <name>Uwe Scholz</name>
+  </maintainer>
+  <changelog>https://git.gnome.org/browse/gnome-commander/tree/NEWS?h=gcmd-1-4</changelog>
+  <bugs-to>https://bugzilla.gnome.org/browse.cgi?product=gnome-commander</bugs-to>
+  <remote-id type="freecode">gnome-commander</remote-id>
+</upstream>
+<use>
+  <flag name="chm">Enable metadata support for Microsoft Compiled HTML Help files</flag>
+  <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
+  <flag name="pdf">Add metadata support for PDF</flag>
+  <flag name="python">Add support for python plugins"</flag>
+  <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild
index f1b8d2365c12..21683c079933 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild,v 1.5 2014/03/09 11:59:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild,v 1.6 2014/05/04 04:58:24 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 VALA_MIN_API_VERSION="0.22"
+VALA_MAX_API_VERSION="0.22" # build fails with 0.24
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.10.2.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.10.2.ebuild
index c63c6f5778fb..578782831cd3 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.10.2.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.10.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/gnome-extra/gnome-documents/gnome-documents-3.10.2.ebuild,v 1.1 2014/03/16 15:03:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/gnome-documents-3.10.2.ebuild,v 1.3 2014/05/04 12:10:35 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-24.ebuild b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-24.ebuild
index 1fea0eaf97a0..e0d6c9c882c0 100644
--- a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-24.ebuild
+++ b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-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/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-24.ebuild,v 1.1 2014/04/12 14:26:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-24.ebuild,v 1.3 2014/05/04 12:10:39 pacho Exp $
 
 EAPI="5"
 
@@ -10,7 +10,7 @@ SRC_URI="http://94.247.144.115/repo/topicons/snapshot/topicons-${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.10.2.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.10.2.ebuild
index 30450e44f18b..d26e73b6e6ab 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.10.2.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.10.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/gnome-extra/gnome-user-share/gnome-user-share-3.10.2.ebuild,v 1.2 2014/05/02 08:15:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.10.2.ebuild,v 1.4 2014/05/04 12:10:44 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bluetooth"
 
 # FIXME: could libnotify be made optional ?
diff --git a/gnome-extra/libgsf/libgsf-1.14.30.ebuild b/gnome-extra/libgsf/libgsf-1.14.30.ebuild
index cd37cbf7acb3..5d6cdca5ff59 100644
--- a/gnome-extra/libgsf/libgsf-1.14.30.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.30.ebuild,v 1.2 2014/05/02 13:04:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.30.ebuild,v 1.4 2014/05/04 12:10:49 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild b/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild
index 4edbf4ee3887..6bb3162b9112 100644
--- a/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild
+++ b/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-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/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild,v 1.1 2014/04/25 13:33:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild,v 1.3 2014/05/04 12:10:53 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://launchpad.net/zeitgeist-extensions/"
 SRC_URI="http://launchpad.net/${PN}/trunk/fts-${PV}/+download/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 IUSE="fts geolocation memprofile sqldebug tracker"
 
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.6-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.6-r1.ebuild
index d34785821aaa..7640819f4fa1 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.6-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.24.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/gnustep-base/gnustep-base/gnustep-base-1.24.6-r1.ebuild,v 1.1 2014/04/23 09:50:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.6-r1.ebuild,v 1.2 2014/05/04 08:20:18 ago Exp $
 
 EAPI=5
 inherit eutils gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="+icu +libffi ssl zeroconf"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild
new file mode 100644
index 000000000000..2284ff5fe99d
--- /dev/null
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild,v 1.1 2014/05/03 18:53:36 tomwij Exp $
+
+EAPI="5"
+
+inherit java-virtuals-2
+
+DESCRIPTION="Virtual ebuilds that require internal com.sun classes from a JDK"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| (
+			dev-java/icedtea-bin:6
+			dev-java/icedtea:6
+			dev-java/icedtea-bin:7
+			dev-java/icedtea:7
+			dev-java/oracle-jdk-bin:1.7
+			dev-java/oracle-jdk-bin:1.8
+			dev-java/diablo-jdk:1.6
+			dev-java/apple-jdk-bin:1.6
+			dev-java/apple-jdk-bin:1.5
+			dev-java/apple-jdk-bin:1.4
+		)"
+
+JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 oracle-jdk-bin-1.7 oracle-jdk-bin-1.8 diablo-jdk-1.6 apple-jdk-bin-1.6 apple-jdk-bin-1.5 apple-jdk-bin-1.4"
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.13.0.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.13.0.ebuild
index 967f4b1aa7c8..f75181c5bc50 100644
--- a/kde-base/akonadiconsole/akonadiconsole-4.13.0.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.13.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/kde-base/akonadiconsole/akonadiconsole-4.13.0.ebuild,v 1.5 2014/04/22 23:34:14 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.13.0.ebuild,v 1.6 2014/05/03 14:18:01 maekke Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="Akonadi developer console"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/akregator/akregator-4.13.0.ebuild b/kde-base/akregator/akregator-4.13.0.ebuild
index 4267a06d4c80..879e6d48aea4 100644
--- a/kde-base/akregator/akregator-4.13.0.ebuild
+++ b/kde-base/akregator/akregator-4.13.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/kde-base/akregator/akregator-4.13.0.ebuild,v 1.2 2014/04/17 00:43:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.13.0.ebuild,v 1.3 2014/05/03 14:19:41 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE news feed aggregator."
 HOMEPAGE="http://www.kde.org/applications/internet/akregator"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/artikulate/artikulate-4.13.0.ebuild b/kde-base/artikulate/artikulate-4.13.0.ebuild
index fdf9c607651d..cc9010bbca2d 100644
--- a/kde-base/artikulate/artikulate-4.13.0.ebuild
+++ b/kde-base/artikulate/artikulate-4.13.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/kde-base/artikulate/artikulate-4.13.0.ebuild,v 1.1 2014/04/22 15:50:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artikulate/artikulate-4.13.0.ebuild,v 1.2 2014/05/04 12:15:16 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base multilib
 
 DESCRIPTION="Language learning application that helps improving pronunciation skills"
 HOMEPAGE="http://edu.kde.org/applications/language/artikulate"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug gstreamer"
 
 DEPEND="
diff --git a/kde-base/baloo-widgets/baloo-widgets-4.13.0.ebuild b/kde-base/baloo-widgets/baloo-widgets-4.13.0.ebuild
index c12bd92bd682..70b1af81909f 100644
--- a/kde-base/baloo-widgets/baloo-widgets-4.13.0.ebuild
+++ b/kde-base/baloo-widgets/baloo-widgets-4.13.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo-widgets/baloo-widgets-4.13.0.ebuild,v 1.2 2014/04/17 00:43:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo-widgets/baloo-widgets-4.13.0.ebuild,v 1.3 2014/05/03 14:24:38 maekke Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Widget library for baloo"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=" ~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/baloo/baloo-4.13.0.ebuild b/kde-base/baloo/baloo-4.13.0.ebuild
index f76046ff97e5..8aac2ef41ba7 100644
--- a/kde-base/baloo/baloo-4.13.0.ebuild
+++ b/kde-base/baloo/baloo-4.13.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild,v 1.4 2014/04/19 23:22:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild,v 1.6 2014/05/04 01:17:05 dilfridge Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Next generation of the Nepomuk project"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
+KEYWORDS=" ~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +alternatekcm"
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
@@ -18,6 +18,14 @@ DEPEND="
 	sys-apps/attr
 	!<kde-base/nepomuk-4.12.50
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	alternatekcm? ( kde-misc/baloo-kcmadv )
+"
 
 RESTRICT="test"
+
+src_prepare() {
+	kde4-base_src_prepare
+	use alternatekcm && epatch "${FILESDIR}/${P}-nokcm.patch"
+}
diff --git a/kde-base/baloo/files/baloo-4.13.0-nokcm.patch b/kde-base/baloo/files/baloo-4.13.0-nokcm.patch
new file mode 100644
index 000000000000..7690b40715a3
--- /dev/null
+++ b/kde-base/baloo/files/baloo-4.13.0-nokcm.patch
@@ -0,0 +1,11 @@
+diff -ruN baloo-4.13.0.orig/src/file/CMakeLists.txt baloo-4.13.0/src/file/CMakeLists.txt
+--- baloo-4.13.0.orig/src/file/CMakeLists.txt	2014-04-15 18:30:06.000000000 +0200
++++ baloo-4.13.0/src/file/CMakeLists.txt	2014-05-04 02:58:00.312192920 +0200
+@@ -66,6 +66,6 @@
+ add_subdirectory(autotest)
+ add_subdirectory(tests)
+ add_subdirectory(extractor)
+-add_subdirectory(kcm)
++#add_subdirectory(kcm)
+ add_subdirectory(inotify)
+ add_subdirectory(cleaner)
diff --git a/kde-base/baloo/metadata.xml b/kde-base/baloo/metadata.xml
index a23f444b67d6..64a27d28fd6c 100644
--- a/kde-base/baloo/metadata.xml
+++ b/kde-base/baloo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+        <use>
+                <flag name="alternatekcm">Use the alternate Systemsettings module by Lindsay Mathieson for better configurability</flag>
+        </use>
 </pkgmetadata>
diff --git a/kde-base/blogilo/blogilo-4.13.0.ebuild b/kde-base/blogilo/blogilo-4.13.0.ebuild
index 4ec6895c76d6..c5cc5387f195 100644
--- a/kde-base/blogilo/blogilo-4.13.0.ebuild
+++ b/kde-base/blogilo/blogilo-4.13.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/kde-base/blogilo/blogilo-4.13.0.ebuild,v 1.2 2014/04/17 00:43:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.13.0.ebuild,v 1.3 2014/05/03 14:20:06 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Blogging Client"
 HOMEPAGE="http://www.kde.org/applications/internet/blogilo"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/calendarjanitor/calendarjanitor-4.13.0.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.13.0.ebuild
index 6d96a8e831ae..8779918fe32e 100644
--- a/kde-base/calendarjanitor/calendarjanitor-4.13.0.ebuild
+++ b/kde-base/calendarjanitor/calendarjanitor-4.13.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/kde-base/calendarjanitor/calendarjanitor-4.13.0.ebuild,v 1.2 2014/04/17 00:43:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/calendarjanitor/calendarjanitor-4.13.0.ebuild,v 1.3 2014/05/03 14:20:29 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="A tool to scan calendar data for buggy instances"
 HOMEPAGE="http://www.kde.org/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/contactthemeeditor/contactthemeeditor-4.13.0.ebuild b/kde-base/contactthemeeditor/contactthemeeditor-4.13.0.ebuild
index 31dbc8e11924..ff295ff2ab9e 100644
--- a/kde-base/contactthemeeditor/contactthemeeditor-4.13.0.ebuild
+++ b/kde-base/contactthemeeditor/contactthemeeditor-4.13.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/kde-base/contactthemeeditor/contactthemeeditor-4.13.0.ebuild,v 1.2 2014/04/17 00:43:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/contactthemeeditor/contactthemeeditor-4.13.0.ebuild,v 1.3 2014/05/03 14:23:27 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="A contact theme editor for KAddressBook"
 HOMEPAGE="http://www.kde.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/dolphin/dolphin-4.13.0.ebuild b/kde-base/dolphin/dolphin-4.13.0.ebuild
index bee7227566f3..a944d1b95ab9 100644
--- a/kde-base/dolphin/dolphin-4.13.0.ebuild
+++ b/kde-base/dolphin/dolphin-4.13.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/kde-base/dolphin/dolphin-4.13.0.ebuild,v 1.3 2014/04/22 13:35:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.13.0.ebuild,v 1.4 2014/05/03 14:25:02 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="A KDE filemanager focusing on usability"
 HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="
diff --git a/kde-base/kaddressbook/kaddressbook-4.13.0.ebuild b/kde-base/kaddressbook/kaddressbook-4.13.0.ebuild
index 7d286cc541a3..9104b15790b4 100644
--- a/kde-base/kaddressbook/kaddressbook-4.13.0.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.13.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/kde-base/kaddressbook/kaddressbook-4.13.0.ebuild,v 1.3 2014/04/22 12:46:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.13.0.ebuild,v 1.4 2014/05/03 14:21:36 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="The KDE Address Book"
 HOMEPAGE="http://www.kde.org/applications/office/kaddressbook/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kalarm/kalarm-4.13.0.ebuild b/kde-base/kalarm/kalarm-4.13.0.ebuild
index ff3942e56c3b..f3aed2459a74 100644
--- a/kde-base/kalarm/kalarm-4.13.0.ebuild
+++ b/kde-base/kalarm/kalarm-4.13.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/kde-base/kalarm/kalarm-4.13.0.ebuild,v 1.2 2014/04/17 00:43:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.13.0.ebuild,v 1.3 2014/05/03 14:25:27 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
 HOMEPAGE+=" http://userbase.kde.org/KAlarm"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kde-meta/kde-meta-4.13.0.ebuild b/kde-base/kde-meta/kde-meta-4.13.0.ebuild
index b7dcc8315b2e..67db0cc0960e 100644
--- a/kde-base/kde-meta/kde-meta-4.13.0.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.13.0.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/kde-base/kde-meta/kde-meta-4.13.0.ebuild,v 1.2 2014/04/17 00:43:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.13.0.ebuild,v 1.3 2014/05/04 12:17:48 maekke Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.13.0.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.13.0.ebuild
index 1a07963cbdbf..456329e44612 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.13.0.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.13.0.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/kde-base/kdebase-meta/kdebase-meta-4.13.0.ebuild,v 1.2 2014/04/17 00:43:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.13.0.ebuild,v 1.3 2014/05/04 12:16:06 maekke Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="+wallpapers"
 
 RDEPEND="
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.13.0.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.13.0.ebuild
index fb2bcac869d1..145079df3a8d 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-4.13.0.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-4.13.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-4.13.0.ebuild,v 1.4 2014/04/22 15:52:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-4.13.0.ebuild,v 1.5 2014/05/04 12:17:25 maekke Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="http://edu.kde.org"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.13.0.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.13.0.ebuild
index 20b4fa5e014e..da6fd846e7c2 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.13.0.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.13.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/kde-base/kdepim-common-libs/kdepim-common-libs-4.13.0.ebuild,v 1.4 2014/04/22 22:20:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.13.0.ebuild,v 1.5 2014/05/03 14:17:38 maekke Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNOMODULE="true"
 inherit kde4-meta
 
 DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.13.0.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.13.0.ebuild
index 4d640978ae45..7a4f0044ab9f 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.13.0.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.13.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/kde-base/kdepim-kresources/kdepim-kresources-4.13.0.ebuild,v 1.2 2014/04/17 00:43:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.13.0.ebuild,v 1.3 2014/05/03 14:26:51 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE PIM groupware plugin collection"
 IUSE="debug"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.13.0.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.13.0.ebuild
index bc6c1ef613f3..49bf48b1015c 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.13.0.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.13.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.13.0.ebuild,v 1.2 2014/04/17 00:43:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.13.0.ebuild,v 1.3 2014/05/04 12:16:35 maekke Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
 HOMEPAGE+=" http://community.kde.org/KDE_PIM"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-base/kfilemetadata/kfilemetadata-4.13.0.ebuild b/kde-base/kfilemetadata/kfilemetadata-4.13.0.ebuild
index 9933348c1160..3f61e06ffb5d 100644
--- a/kde-base/kfilemetadata/kfilemetadata-4.13.0.ebuild
+++ b/kde-base/kfilemetadata/kfilemetadata-4.13.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilemetadata/kfilemetadata-4.13.0.ebuild,v 1.2 2014/04/17 00:43:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilemetadata/kfilemetadata-4.13.0.ebuild,v 1.3 2014/05/03 14:16:47 maekke Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="A library for extracting file metadata"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=" ~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug epub exif ffmpeg mobi pdf taglib"
 
 DEPEND="
diff --git a/kde-base/kjots/kjots-4.13.0.ebuild b/kde-base/kjots/kjots-4.13.0.ebuild
index bdd68825b0da..7179f595aab3 100644
--- a/kde-base/kjots/kjots-4.13.0.ebuild
+++ b/kde-base/kjots/kjots-4.13.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/kde-base/kjots/kjots-4.13.0.ebuild,v 1.2 2014/04/17 00:43:18 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.13.0.ebuild,v 1.3 2014/05/03 14:27:16 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE note taking utility"
 HOMEPAGE="http://www.kde.org/applications/utilities/kjots/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kleopatra/kleopatra-4.13.0.ebuild b/kde-base/kleopatra/kleopatra-4.13.0.ebuild
index e20f7aa16c5d..8c2cbdfec088 100644
--- a/kde-base/kleopatra/kleopatra-4.13.0.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.13.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/kde-base/kleopatra/kleopatra-4.13.0.ebuild,v 1.2 2014/04/17 00:43:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.13.0.ebuild,v 1.3 2014/05/03 14:27:41 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Kleopatra - KDE X.509 key manager"
 HOMEPAGE="http://www.kde.org/applications/utilities/kleopatra/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kmail/kmail-4.13.0.ebuild b/kde-base/kmail/kmail-4.13.0.ebuild
index a822c0f95e81..bce533981e01 100644
--- a/kde-base/kmail/kmail-4.13.0.ebuild
+++ b/kde-base/kmail/kmail-4.13.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/kde-base/kmail/kmail-4.13.0.ebuild,v 1.2 2014/04/17 00:43:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.13.0.ebuild,v 1.3 2014/05/03 14:23:04 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
 HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/knode/knode-4.13.0.ebuild b/kde-base/knode/knode-4.13.0.ebuild
index 90ebcfd869f1..b273dc16a26a 100644
--- a/kde-base/knode/knode-4.13.0.ebuild
+++ b/kde-base/knode/knode-4.13.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/kde-base/knode/knode-4.13.0.ebuild,v 1.2 2014/04/17 00:43:18 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.13.0.ebuild,v 1.3 2014/05/03 14:28:06 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="A newsreader for KDE"
 HOMEPAGE="http://www.kde.org/applications/internet/knode/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # test fails, last checked for 4.2.96
diff --git a/kde-base/knotes/knotes-4.13.0.ebuild b/kde-base/knotes/knotes-4.13.0.ebuild
index 34d99cd2aa6a..5d560db4ffa6 100644
--- a/kde-base/knotes/knotes-4.13.0.ebuild
+++ b/kde-base/knotes/knotes-4.13.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/kde-base/knotes/knotes-4.13.0.ebuild,v 1.2 2014/04/17 00:43:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.13.0.ebuild,v 1.3 2014/05/03 14:28:31 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Notes application"
 HOMEPAGE="http://www.kde.org/applications/utilities/knotes/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.13.0.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.13.0.ebuild
index f81a0265fbbd..217fba1db024 100644
--- a/kde-base/konsolekalendar/konsolekalendar-4.13.0.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.13.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/kde-base/konsolekalendar/konsolekalendar-4.13.0.ebuild,v 1.2 2014/04/17 00:43:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.13.0.ebuild,v 1.3 2014/05/03 14:28:55 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="A command line interface to KDE calendars"
 HOMEPAGE+=" http://userbase.kde.org/KonsoleKalendar"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kontact/kontact-4.13.0.ebuild b/kde-base/kontact/kontact-4.13.0.ebuild
index ade9f45e63c8..ae98d45d9ad2 100644
--- a/kde-base/kontact/kontact-4.13.0.ebuild
+++ b/kde-base/kontact/kontact-4.13.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/kde-base/kontact/kontact-4.13.0.ebuild,v 1.2 2014/04/17 00:43:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.13.0.ebuild,v 1.3 2014/05/03 14:19:17 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE personal information manager"
 HOMEPAGE="http://www.kde.org/applications/office/kontact/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/korganizer/korganizer-4.13.0.ebuild b/kde-base/korganizer/korganizer-4.13.0.ebuild
index 29ca8115b21d..7a512cc0fa92 100644
--- a/kde-base/korganizer/korganizer-4.13.0.ebuild
+++ b/kde-base/korganizer/korganizer-4.13.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/kde-base/korganizer/korganizer-4.13.0.ebuild,v 1.2 2014/04/17 00:43:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.13.0.ebuild,v 1.3 2014/05/03 14:22:40 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="A Personal Organizer for KDE"
 HOMEPAGE="http://www.kde.org/applications/office/korganizer/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kqtquickcharts/kqtquickcharts-4.13.0.ebuild b/kde-base/kqtquickcharts/kqtquickcharts-4.13.0.ebuild
index ee5596703991..ed166835097f 100644
--- a/kde-base/kqtquickcharts/kqtquickcharts-4.13.0.ebuild
+++ b/kde-base/kqtquickcharts/kqtquickcharts-4.13.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/kde-base/kqtquickcharts/kqtquickcharts-4.13.0.ebuild,v 1.1 2014/04/22 13:50:38 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kqtquickcharts/kqtquickcharts-4.13.0.ebuild,v 1.2 2014/05/03 17:19:02 maekke Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ DECLARATIVE_REQUIRED="always"
 inherit kde4-base
 
 DESCRIPTION="Qt Quick 1 plugin for beautiful and interactive charts"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=" ~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="$(add_kdebase_dep plasma-workspace '' 4.11)"
diff --git a/kde-base/ktimetracker/ktimetracker-4.13.0.ebuild b/kde-base/ktimetracker/ktimetracker-4.13.0.ebuild
index 31b2e25da13f..a718f3a6bb17 100644
--- a/kde-base/ktimetracker/ktimetracker-4.13.0.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.13.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/kde-base/ktimetracker/ktimetracker-4.13.0.ebuild,v 1.2 2014/04/17 00:43:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.13.0.ebuild,v 1.3 2014/05/03 14:29:22 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KTimeTracker tracks time spent on various tasks."
 HOEMPAGE="http://www.kde.org/applications/utilities/ktimetracker/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/ktouch/ktouch-4.13.0.ebuild b/kde-base/ktouch/ktouch-4.13.0.ebuild
index 64d19c95bd21..69a1cda0ee88 100644
--- a/kde-base/ktouch/ktouch-4.13.0.ebuild
+++ b/kde-base/ktouch/ktouch-4.13.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/kde-base/ktouch/ktouch-4.13.0.ebuild,v 1.3 2014/04/22 13:58:51 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.13.0.ebuild,v 1.4 2014/05/03 17:19:35 maekke Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
 HOMEPAGE="http://edu.kde.org/applications/miscellaneous/ktouch"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-misc/homerun/Manifest b/kde-misc/homerun/Manifest
index 6fe36e806367..ef2f97961845 100644
--- a/kde-misc/homerun/Manifest
+++ b/kde-misc/homerun/Manifest
@@ -1,2 +1,2 @@
-DIST homerun-1.2.2.tar.xz 208292 SHA256 d197f47c9ee0826f3ddaa167203971360b945f7fb97b45193fc14584ce7b13ea SHA512 2edc3e44bb18a881742b2eb7877a839285550fd64a359dff4349facccb0c4c1177c20c7a0b84b157c15a44ac0c844e4e3b385483e9a8ce3ada451a28caa23c28 WHIRLPOOL 8e22f5a34ac5e5a44828940d137857ae517cfe2fa53ebd1a617045fb5d6c2a2a2cd2d7c61d6e52bd2b4e09ed6e626e2ff05a2fe926c85720ae1d4102b3a4d577
 DIST homerun-1.2.3.tar.xz 207680 SHA256 156f0bea0b01be4f7c6a196123401ddbea573b97d26677c1faaff59b8cbe881a SHA512 b516e22de20afc12de55a445d23d8c6bfa531189e66027d019f0ef6e7f42cffbaf71d4ea0e4c345eb57b39b0d9e0bf7e64a045a089398d74727c29fa106258d8 WHIRLPOOL ebef0f6d0c09760af1c722b56bf1b3d33918759751c4b39dc246991d1c5fbee8b34a4e601241e23b3a97ead109632ee657283cfe5eeddb0cff5a728908095650
+DIST homerun-1.2.4.tar.xz 206108 SHA256 be277e7b7358a828ee86b1e121faf23ad35d0fe0677c370ba0760db5b64ac7da SHA512 6f7121b5acce140c9ed3084b529ecfca8a3a4bb0a21dc7fb53ac64a374453ffc52f894db79851057622568d8f084b9adb307a94b2c543e71485d4afbf90da80d WHIRLPOOL 46168877d1fd2fb11b0ced60898f189a8621e88dc5f56a5500894851c32f950ee61f6619e3d5992c7f28eaf307359773f92e64bd1204a015f75e7734cf0de970
diff --git a/kde-misc/homerun/homerun-1.2.2.ebuild b/kde-misc/homerun/homerun-1.2.4.ebuild
similarity index 85%
rename from kde-misc/homerun/homerun-1.2.2.ebuild
rename to kde-misc/homerun/homerun-1.2.4.ebuild
index 54f6e71cbde7..75bbd025e937 100644
--- a/kde-misc/homerun/homerun-1.2.2.ebuild
+++ b/kde-misc/homerun/homerun-1.2.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/homerun/homerun-1.2.2.ebuild,v 1.1 2014/03/24 10:28:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/homerun/homerun-1.2.4.ebuild,v 1.1 2014/05/02 22:20:37 johu Exp $
 
 EAPI=5
 
 DECLARATIVE_REQUIRED="always"
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-KDE_LINGUAS="ca cs da de el es fi fr gl hu it lt nl pl pt pt_BR ro ru sk sl sv
-tr uk zh_CN"
+KDE_LINGUAS="ca ca@valencia cs da de el es fi fr gl it nl pl pt pt_BR ro sk sl
+sv tr uk zh_CN"
 KDE_MINIMAL="4.10"
 inherit kde4-base
 
diff --git a/kde-misc/kcm-grub2/kcm-grub2-0.6.4-r1.ebuild b/kde-misc/kcm-grub2/kcm-grub2-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..d5c96bfa2e92
--- /dev/null
+++ b/kde-misc/kcm-grub2/kcm-grub2-0.6.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/kcm-grub2-0.6.4-r1.ebuild,v 1.1 2014/05/03 10:36:52 thev00d00 Exp $
+
+EAPI=5
+
+KDE_LINGUAS="ca ca@valencia cs da de el es et fi fr ga gl hu it lt nl pa pl pt
+pt_BR ro ru sk sl sv uk tr zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KCModule for configuring the GRUB2 bootloader."
+HOMEPAGE="http://kde-apps.org/content/show.php?content=139643"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="+hwinfo imagemagick packagekit"
+
+COMMON_DEPEND="
+	hwinfo? ( sys-apps/hwinfo )
+	imagemagick? ( media-gfx/imagemagick )
+	packagekit? ( app-admin/packagekit-qt4 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/automoc
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdebase_dep kcmshell)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITHQApt=OFF"
+		"-DGRUB_INSTALL_EXE=/usr/sbin/grub2-install"
+		"-DGRUB_MKCONFIG_EXE=/usr/sbin/grub2-mkconfig"
+		"-DGRUB_PROBE_EXE=/usr/sbin/grub2-probe"
+		"-DGRUB_SET_DEFAULT_EXE=/usr/sbin/grub2-set-default"
+		"-DGRUB_MENU=/boot/grub/grub.cfg"
+		"-DGRUB_CONFIG=/etc/default/grub"
+		"-DGRUB_ENV=/boot/grub/grubenv"
+		"-DGRUB_MEMTEST=/etc/grub.d/39_memtest86+"
+		$(cmake-utils_use_with packagekit QPackageKit)
+		$(cmake-utils_use_with imagemagick ImageMagick)
+		$(cmake-utils_use_with hwinfo HD)
+	)
+	cmake-utils_src_configure
+}
diff --git a/kde-misc/kcm-grub2/metadata.xml b/kde-misc/kcm-grub2/metadata.xml
index 864a50d0539d..ef2481bb7a1e 100644
--- a/kde-misc/kcm-grub2/metadata.xml
+++ b/kde-misc/kcm-grub2/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>kde</herd>
 <maintainer>
-	<email>thev00d00@gentoo.org</email>
+	<email>thevoodoo@gentoo.org</email>
 	<name>Ian Whyman</name>
 </maintainer>
 <use>
diff --git a/mate-base/libmatekbd/libmatekbd-1.6.2.ebuild b/mate-base/libmatekbd/libmatekbd-1.6.2.ebuild
index 79ab9bf2d8ee..fc6137073330 100644
--- a/mate-base/libmatekbd/libmatekbd-1.6.2.ebuild
+++ b/mate-base/libmatekbd/libmatekbd-1.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/mate-base/libmatekbd/libmatekbd-1.6.2.ebuild,v 1.4 2014/03/10 22:53:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/libmatekbd/libmatekbd-1.6.2.ebuild,v 1.5 2014/05/04 14:53:23 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X test"
 
diff --git a/mate-base/libmatekeyring/libmatekeyring-1.6.1.ebuild b/mate-base/libmatekeyring/libmatekeyring-1.6.1.ebuild
index a988cd4e4184..b5c65dc84cb0 100644
--- a/mate-base/libmatekeyring/libmatekeyring-1.6.1.ebuild
+++ b/mate-base/libmatekeyring/libmatekeyring-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/mate-base/libmatekeyring/libmatekeyring-1.6.1.ebuild,v 1.1 2014/03/24 14:40:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/libmatekeyring/libmatekeyring-1.6.1.ebuild,v 1.2 2014/05/04 14:53:26 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="debug test"
 
diff --git a/mate-base/mate-applets/mate-applets-1.6.2.ebuild b/mate-base/mate-applets/mate-applets-1.6.2.ebuild
index 4a4624476fee..41869fa056d0 100644
--- a/mate-base/mate-applets/mate-applets-1.6.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.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/mate-base/mate-applets/mate-applets-1.6.2.ebuild,v 1.2 2014/03/17 21:32:58 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.6.2.ebuild,v 1.3 2014/05/04 14:53:35 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X ipv6 networkmanager policykit"
 
diff --git a/mate-base/mate-common/mate-common-1.6.2.ebuild b/mate-base/mate-common/mate-common-1.6.2.ebuild
index c9aac95e64d6..da5e2c2f42c9 100644
--- a/mate-base/mate-common/mate-common-1.6.2.ebuild
+++ b/mate-base/mate-common/mate-common-1.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/mate-base/mate-common/mate-common-1.6.2.ebuild,v 1.1 2014/02/26 21:52:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-common/mate-common-1.6.2.ebuild,v 1.2 2014/05/04 14:53:38 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_install() {
 	mv doc-build/README README.doc-build \
diff --git a/mate-base/mate-control-center/mate-control-center-1.6.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.6.2.ebuild
index e0c0786d5fc4..7392b68867eb 100644
--- a/mate-base/mate-control-center/mate-control-center-1.6.2.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.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/mate-base/mate-control-center/mate-control-center-1.6.2.ebuild,v 1.4 2014/05/02 13:07:15 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-control-center/mate-control-center-1.6.2.ebuild,v 1.5 2014/05/04 14:53:43 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="app-text/rarian:0
 	dev-libs/atk:0
diff --git a/mate-base/mate-desktop/mate-desktop-1.6.2-r1.ebuild b/mate-base/mate-desktop/mate-desktop-1.6.2-r1.ebuild
index ac568bb0e4a0..a2409d7f7d62 100644
--- a/mate-base/mate-desktop/mate-desktop-1.6.2-r1.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.6.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/mate-base/mate-desktop/mate-desktop-1.6.2-r1.ebuild,v 1.1 2014/03/24 15:05:46 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/mate-desktop-1.6.2-r1.ebuild,v 1.2 2014/05/04 14:53:47 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X startup-notification"
 
diff --git a/mate-base/mate-file-manager/mate-file-manager-1.6.3-r1.ebuild b/mate-base/mate-file-manager/mate-file-manager-1.6.3-r1.ebuild
index fb2c0e1ded2f..36819c6e2d32 100644
--- a/mate-base/mate-file-manager/mate-file-manager-1.6.3-r1.ebuild
+++ b/mate-base/mate-file-manager/mate-file-manager-1.6.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/mate-base/mate-file-manager/mate-file-manager-1.6.3-r1.ebuild,v 1.1 2014/04/03 14:05:41 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-file-manager/mate-file-manager-1.6.3-r1.ebuild,v 1.2 2014/05/04 14:53:51 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X +mate +introspection +unique xmp"
 
diff --git a/mate-base/mate-keyring/mate-keyring-1.6.1.ebuild b/mate-base/mate-keyring/mate-keyring-1.6.1.ebuild
index 0e65bef5e491..b37b3baf6ef4 100644
--- a/mate-base/mate-keyring/mate-keyring-1.6.1.ebuild
+++ b/mate-base/mate-keyring/mate-keyring-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/mate-base/mate-keyring/mate-keyring-1.6.1.ebuild,v 1.2 2014/03/24 15:44:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-keyring/mate-keyring-1.6.1.ebuild,v 1.3 2014/05/04 14:53:55 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="debug +gpg-agent pam +ssh-agent test"
 
diff --git a/mate-base/mate-menus/mate-menus-1.6.0.ebuild b/mate-base/mate-menus/mate-menus-1.6.0.ebuild
index 95bd8f95a6ef..9188f0ff9837 100644
--- a/mate-base/mate-menus/mate-menus-1.6.0.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-menus/mate-menus-1.6.0.ebuild,v 1.5 2014/03/10 23:11:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-menus/mate-menus-1.6.0.ebuild,v 1.6 2014/05/04 14:53:59 ago Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="debug +introspection python"
 
diff --git a/mate-base/mate-panel/mate-panel-1.6.1.ebuild b/mate-base/mate-panel/mate-panel-1.6.1.ebuild
index e1ae1e6aa8ba..4808354e781e 100644
--- a/mate-base/mate-panel/mate-panel-1.6.1.ebuild
+++ b/mate-base/mate-panel/mate-panel-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/mate-base/mate-panel/mate-panel-1.6.1.ebuild,v 1.7 2014/03/24 16:02:41 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/mate-panel-1.6.1.ebuild,v 1.8 2014/05/04 14:54:03 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X +introspection networkmanager"
 
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild
index 92aea11eb71e..d3b687526e81 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.6.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/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild,v 1.5 2014/03/10 22:58:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild,v 1.6 2014/05/04 14:54:07 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org/"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="ipv6 elibc_FreeBSD gnome-keyring systemd"
 
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.6.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.6.2.ebuild
index 9fbdea3fc26a..09842f2837d4 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.6.2.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.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/mate-base/mate-settings-daemon/mate-settings-daemon-1.6.2.ebuild,v 1.3 2014/03/10 16:12:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-settings-daemon/mate-settings-daemon-1.6.2.ebuild,v 1.4 2014/05/04 14:54:11 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X debug libnotify policykit pulseaudio smartcard"
 
diff --git a/mate-base/mate/mate-1.6.0.ebuild b/mate-base/mate/mate-1.6.0.ebuild
index 44602ff1b6ea..907b1584b39d 100644
--- a/mate-base/mate/mate-1.6.0.ebuild
+++ b/mate-base/mate/mate-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate/mate-1.6.0.ebuild,v 1.1 2014/03/24 17:58:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate/mate-1.6.0.ebuild,v 1.2 2014/05/04 14:53:30 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://mate-desktop.org"
 LICENSE="metapackage"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bluetooth +extras"
 
 S="${WORKDIR}"
diff --git a/mate-extra/caja-dropbox/caja-dropbox-0.7.1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-0.7.1.ebuild
index 0913470af469..bebbe0f9f5b3 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-0.7.1.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-0.7.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/mate-extra/caja-dropbox/caja-dropbox-0.7.1.ebuild,v 1.1 2014/03/17 21:28:08 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-dropbox/caja-dropbox-0.7.1.ebuild,v 1.2 2014/05/04 14:54:15 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.dropbox.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="debug"
 
diff --git a/mate-extra/mate-calc/mate-calc-1.6.1.ebuild b/mate-extra/mate-calc/mate-calc-1.6.1.ebuild
index 6c7ba518130e..2af6995aab5d 100644
--- a/mate-extra/mate-calc/mate-calc-1.6.1.ebuild
+++ b/mate-extra/mate-calc/mate-calc-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/mate-extra/mate-calc/mate-calc-1.6.1.ebuild,v 1.5 2014/03/10 22:49:19 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-calc/mate-calc-1.6.1.ebuild,v 1.6 2014/05/04 14:54:19 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="app-text/rarian:0
 	>=dev-libs/glib-2.30:2
diff --git a/mate-extra/mate-character-map/mate-character-map-1.6.0.ebuild b/mate-extra/mate-character-map/mate-character-map-1.6.0.ebuild
index 838cb5c5b882..50f07d8d22ca 100644
--- a/mate-extra/mate-character-map/mate-character-map-1.6.0.ebuild
+++ b/mate-extra/mate-character-map/mate-character-map-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-character-map/mate-character-map-1.6.0.ebuild,v 1.4 2014/04/14 02:43:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-character-map/mate-character-map-1.6.0.ebuild,v 1.5 2014/05/04 14:54:23 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="cjk +introspection test"
 
diff --git a/mate-extra/mate-dialogs/mate-dialogs-1.6.2.ebuild b/mate-extra/mate-dialogs/mate-dialogs-1.6.2.ebuild
index 82af7cd4ac1a..c8b6d33f0224 100644
--- a/mate-extra/mate-dialogs/mate-dialogs-1.6.2.ebuild
+++ b/mate-extra/mate-dialogs/mate-dialogs-1.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/mate-extra/mate-dialogs/mate-dialogs-1.6.2.ebuild,v 1.3 2014/03/10 22:01:00 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-dialogs/mate-dialogs-1.6.2.ebuild,v 1.4 2014/05/04 14:54:27 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="libnotify"
 
diff --git a/mate-extra/mate-file-manager-image-converter/mate-file-manager-image-converter-1.6.0.ebuild b/mate-extra/mate-file-manager-image-converter/mate-file-manager-image-converter-1.6.0.ebuild
index 31fe99ed4d7d..a59ebfd59a9b 100644
--- a/mate-extra/mate-file-manager-image-converter/mate-file-manager-image-converter-1.6.0.ebuild
+++ b/mate-extra/mate-file-manager-image-converter/mate-file-manager-image-converter-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-file-manager-image-converter/mate-file-manager-image-converter-1.6.0.ebuild,v 1.1 2014/03/17 21:56:30 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-file-manager-image-converter/mate-file-manager-image-converter-1.6.0.ebuild,v 1.2 2014/05/04 14:54:30 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-libs/glib-2.28:2
 	>=mate-base/mate-file-manager-1.6:0
diff --git a/mate-extra/mate-file-manager-open-terminal/mate-file-manager-open-terminal-1.6.0.ebuild b/mate-extra/mate-file-manager-open-terminal/mate-file-manager-open-terminal-1.6.0.ebuild
index 92fdbf82c48c..c2008d34ae9c 100644
--- a/mate-extra/mate-file-manager-open-terminal/mate-file-manager-open-terminal-1.6.0.ebuild
+++ b/mate-extra/mate-file-manager-open-terminal/mate-file-manager-open-terminal-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-file-manager-open-terminal/mate-file-manager-open-terminal-1.6.0.ebuild,v 1.1 2014/03/17 22:17:55 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-file-manager-open-terminal/mate-file-manager-open-terminal-1.6.0.ebuild,v 1.2 2014/05/04 14:54:35 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-libs/glib-2.4:2
 	>=mate-base/mate-desktop-1.6:0
diff --git a/mate-extra/mate-file-manager-sendto/mate-file-manager-sendto-1.6.0.ebuild b/mate-extra/mate-file-manager-sendto/mate-file-manager-sendto-1.6.0.ebuild
index 06e2ce3c9042..e4879a0d5457 100644
--- a/mate-extra/mate-file-manager-sendto/mate-file-manager-sendto-1.6.0.ebuild
+++ b/mate-extra/mate-file-manager-sendto/mate-file-manager-sendto-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-file-manager-sendto/mate-file-manager-sendto-1.6.0.ebuild,v 1.1 2014/03/17 22:39:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-file-manager-sendto/mate-file-manager-sendto-1.6.0.ebuild,v 1.2 2014/05/04 14:54:39 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="cdr gajim +mail pidgin upnp"
 
diff --git a/mate-extra/mate-file-manager-share/mate-file-manager-share-1.6.0.ebuild b/mate-extra/mate-file-manager-share/mate-file-manager-share-1.6.0.ebuild
index 707dfcbdbec0..04a376c8676f 100644
--- a/mate-extra/mate-file-manager-share/mate-file-manager-share-1.6.0.ebuild
+++ b/mate-extra/mate-file-manager-share/mate-file-manager-share-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-file-manager-share/mate-file-manager-share-1.6.0.ebuild,v 1.1 2014/03/17 23:11:45 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-file-manager-share/mate-file-manager-share-1.6.0.ebuild,v 1.2 2014/05/04 14:54:43 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 COMMON_DEPEND=">=dev-libs/glib-2.4:2
 	>=mate-base/mate-file-manager-1.6:0
diff --git a/mate-extra/mate-media/mate-media-1.6.1.ebuild b/mate-extra/mate-media/mate-media-1.6.1.ebuild
index 6e5cb567dd12..0c2141771f1c 100644
--- a/mate-extra/mate-media/mate-media-1.6.1.ebuild
+++ b/mate-extra/mate-media/mate-media-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/mate-extra/mate-media/mate-media-1.6.1.ebuild,v 1.2 2014/03/22 20:16:37 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-media/mate-media-1.6.1.ebuild,v 1.3 2014/05/04 14:54:47 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="LGPL-2 GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="aac flac mp3 pulseaudio speex twolame vorbis"
 
diff --git a/mate-extra/mate-polkit/mate-polkit-1.6.1.ebuild b/mate-extra/mate-polkit/mate-polkit-1.6.1.ebuild
index f550646cc6b1..15c149ca2087 100644
--- a/mate-extra/mate-polkit/mate-polkit-1.6.1.ebuild
+++ b/mate-extra/mate-polkit/mate-polkit-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/mate-extra/mate-polkit/mate-polkit-1.6.1.ebuild,v 1.3 2014/03/10 22:03:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-polkit/mate-polkit-1.6.1.ebuild,v 1.4 2014/05/04 14:54:51 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/mate-desktop/mate-polkit"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+introspection"
 
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild
index f177f1c9bc85..a182e345d82e 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-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/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild,v 1.3 2014/03/10 22:07:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild,v 1.4 2014/05/04 14:54:55 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+applet gnome-keyring man policykit test unique"
 
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r2.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r2.ebuild
index 86a30e21842c..716ab7130d1f 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r2.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.6.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/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r2.ebuild,v 1.1 2014/03/13 17:15:33 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r2.ebuild,v 1.2 2014/05/04 14:54:59 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X consolekit kernel_linux libnotify opengl pam systemd"
 
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.6.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.6.1.ebuild
index 3c08aeeb88e7..df2d0f5dd4d4 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.6.1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-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/mate-extra/mate-sensors-applet/mate-sensors-applet-1.6.1.ebuild,v 1.4 2014/03/10 22:36:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-sensors-applet/mate-sensors-applet-1.6.1.ebuild,v 1.5 2014/05/04 14:55:03 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+dbus hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
 
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.6.1.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.6.1.ebuild
index 8e851b5a1fdb..f84f17e3960f 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.6.1.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-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/mate-extra/mate-system-monitor/mate-system-monitor-1.6.1.ebuild,v 1.1 2014/03/10 23:53:58 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-system-monitor/mate-system-monitor-1.6.1.ebuild,v 1.2 2014/05/04 14:55:07 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="app-text/rarian:0
 	>=dev-cpp/glibmm-2.16:2
diff --git a/mate-extra/mate-user-share/mate-user-share-1.6.1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.6.1.ebuild
index d873690377d8..45e941464119 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.6.1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-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/mate-extra/mate-user-share/mate-user-share-1.6.1.ebuild,v 1.1 2014/03/23 16:26:27 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-user-share/mate-user-share-1.6.1.ebuild,v 1.2 2014/05/04 14:55:11 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.mate-desktop.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X bluetooth"
 
diff --git a/mate-extra/mate-utils/mate-utils-1.6.1.ebuild b/mate-extra/mate-utils/mate-utils-1.6.1.ebuild
index adcc0bd3bbf4..563c7465a108 100644
--- a/mate-extra/mate-utils/mate-utils-1.6.1.ebuild
+++ b/mate-extra/mate-utils/mate-utils-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/mate-extra/mate-utils/mate-utils-1.6.1.ebuild,v 1.1 2014/03/11 00:41:26 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-utils/mate-utils-1.6.1.ebuild,v 1.2 2014/05/04 14:55:15 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X applet ipv6 test"
 
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
index 8fb52e088116..4235a9976f21 100644
--- a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
+++ b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild,v 1.3 2014/04/26 17:21:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild,v 1.4 2014/05/03 14:13:25 maekke Exp $
 
 inherit font
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wqy/${MY_PN}-pcf-${PV/_rc/-RC}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/media-gfx/gif2apng/Manifest b/media-gfx/gif2apng/Manifest
index fdc3629f2a28..f4ab14577f95 100644
--- a/media-gfx/gif2apng/Manifest
+++ b/media-gfx/gif2apng/Manifest
@@ -1,3 +1,4 @@
 DIST gif2apng-1.6-src.zip 8450 SHA256 1827b443f84319e8549c3235f2c3ac75b88e423bc0bf3218e658ad13b502537b
 DIST gif2apng-1.7-src.zip 8380 SHA256 3ceca8a421bdb6e4f1253a74d20b25cbaf484d8f62edc7f964b423c69d179996
 DIST gif2apng-1.8-src.zip 254365 SHA256 7ef4030dcfaaa5a0cba759d78d3b15c783902dce3aefeb1e8d7d5a6cfacbb639 SHA512 5a99e2b791b4a480c173d02d6360c4760a942b751907e9b3bf5a8db04b9c4a22872e62360f2c8253d1b3a0c5312931ff307175753fac798e3496588171fa8d4a WHIRLPOOL 1553e7c4fc98e21f3c33dc32822a0eb2c627d25357cf626a70aa9ddb59375ce758ce1201360eb31450e2d50f2951ccf5950b90f35a3ddfdd293917ca34bfce60
+DIST gif2apng-1.9-src.zip 258946 SHA256 3b21308e935d799b3ffb4a86c6e00ffa4cb9b3f72f52d58d51c66eb0574ae7d2 SHA512 6f161699aad949466c60e0fb6abb2f38e7ec8353dd15e65ccb9944a66dabc5a4acf32523cb64073c73290e54cc2b753db68123c14f3f7789343491a4f65dcd2c WHIRLPOOL 5e2058886505a89015f756c4d6a9e5f9e1a3efb74a8c754940fe79c6b9a00f54be416d2026bb7c8a3e918d051a5c7bb4681e21dfb0971d55e38f92ef5f04d631
diff --git a/media-gfx/gif2apng/files/gif2apng-1.9-flags.patch b/media-gfx/gif2apng/files/gif2apng-1.9-flags.patch
new file mode 100644
index 000000000000..0fe80eab8384
--- /dev/null
+++ b/media-gfx/gif2apng/files/gif2apng-1.9-flags.patch
@@ -0,0 +1,15 @@
+--- gif2apng-1.9-src/Makefile
++++ gif2apng-1.9-src/Makefile
+@@ -1,10 +1,9 @@
+ PACKAGE    = gif2apng
+ CC         = gcc
+ SRC_DIRS   = . 7z zopfli
+-CFLAGS     = -Wall -pedantic
+-CFLAGS_OPT = -O2
++CFLAGS     += -Wall -pedantic
++CFLAGS_OPT =
+ CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
+-LDFLAGS    = -s
+ LIBS       = -lstdc++ -lm -lz
+ 
+ INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
diff --git a/media-gfx/gif2apng/gif2apng-1.9.ebuild b/media-gfx/gif2apng/gif2apng-1.9.ebuild
new file mode 100644
index 000000000000..1cc8172fac7a
--- /dev/null
+++ b/media-gfx/gif2apng/gif2apng-1.9.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-gfx/gif2apng/gif2apng-1.9.ebuild,v 1.1 2014/05/03 08:54:25 radhermit Exp $
+
+EAPI="5"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="create an APNG from a GIF"
+HOMEPAGE="http://sourceforge.net/projects/gif2apng/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc readme.txt
+}
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 6e5d352a38ba..740549d02d30 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,3 +1,4 @@
 DIST gifsicle-1.67.tar.gz 259070 SHA256 9e31299ae3e64de420eac186036be718069e51f7e199d382f33ddcadc7ab23c2
 DIST gifsicle-1.70.tar.gz 262069 SHA256 8ed2afd9771a78b8afdc2c2f61c548e184fa0cc0b7e671b8dd8d29c109ebc90c SHA512 fce01f2bbec107d11f13045c35e00d9a8a3bb0124552af52735798325b55096bb5ccd7cc489252ac5a55e085377251da330479a7c99cdf914047d07d2f92dae9 WHIRLPOOL 82ffa26c0624498a43140a338abd598de8e6dba4ae842c0a61075edb4cdf754f4ab1397440e9e33963f94e4ea239491550d08a6e5ce191fb826d92eee6659844
 DIST gifsicle-1.78.tar.gz 279592 SHA256 a36c4fe7492b52768ae9edc6f9ce40742c979e67a406b92889924e819e2ef737 SHA512 500a75fbfb21aecaf86e429eaa869cadaa46c2a3413f72123850e9d7b0ac126d991c831247450667e9d1ed7310c1a4ed5ff512e25c2fd0307164f8ef2b3b2633 WHIRLPOOL 931b1801870ac6fd1eff7943896e97325816dacc497119ae17412ba100a11b9b56dd9e1b362efb0fef1a9dc47f596b2e1d6d84fcd5a303c1886c273ba1c914b0
+DIST gifsicle-1.83.tar.gz 562494 SHA256 bf9e94b186dec957d93db1292f4b021a5f5e4c835f412988cd063279bd450eeb SHA512 6de96c5a2f26f1d6838a2ef6d7527bb3c9859334b905fb22ef16dc66ce25e81f8420c7d8fd6b1cc3d889088ea1c1eb8e3b2731a5e86ecf4cd23c5cd3eeeb0e34 WHIRLPOOL d5033d67eed7ea7d0e5d19df860da1d074c3b55933f17dc7958f9b22d99f89699fd17d5ae9d95f38bf683ec4c495e793d26354e7cae0b93e4685f1670d73b881
diff --git a/media-gfx/gifsicle/gifsicle-1.78.ebuild b/media-gfx/gifsicle/gifsicle-1.78.ebuild
index f82bb2c3cf7b..c8afca468ab2 100644
--- a/media-gfx/gifsicle/gifsicle-1.78.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.78.ebuild
@@ -1,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/gifsicle/gifsicle-1.78.ebuild,v 1.2 2014/04/28 08:04:04 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gifsicle/gifsicle-1.78.ebuild,v 1.3 2014/05/04 08:25:18 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
diff --git a/media-gfx/gifsicle/gifsicle-1.83.ebuild b/media-gfx/gifsicle/gifsicle-1.83.ebuild
new file mode 100644
index 000000000000..7b96d25cd015
--- /dev/null
+++ b/media-gfx/gifsicle/gifsicle-1.83.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/media-gfx/gifsicle/gifsicle-1.83.ebuild,v 1.1 2014/05/03 08:57:31 radhermit Exp $
+
+EAPI=5
+
+DESCRIPTION="A command-line tool for creating, editing, and getting information about GIF images and animations"
+HOMEPAGE="http://www.lcdf.org/~eddietwo/gifsicle/"
+SRC_URI="http://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="X"
+
+RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )"
+
+src_configure() {
+	local myconf
+	use X || myconf='--disable-gifview'
+
+	econf ${myconf}
+}
diff --git a/media-gfx/gthumb/gthumb-3.2.7.ebuild b/media-gfx/gthumb/gthumb-3.2.7.ebuild
index 4725187e023f..3225045ac912 100644
--- a/media-gfx/gthumb/gthumb-3.2.7.ebuild
+++ b/media-gfx/gthumb/gthumb-3.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/media-gfx/gthumb/gthumb-3.2.7.ebuild,v 1.1 2014/03/29 19:29:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.2.7.ebuild,v 1.3 2014/05/04 12:10:59 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr exif gstreamer http jpeg json libsecret raw slideshow svg tiff test webkit webp"
 
 COMMON_DEPEND="
diff --git a/media-gfx/mate-image-viewer/mate-image-viewer-1.6.2.ebuild b/media-gfx/mate-image-viewer/mate-image-viewer-1.6.2.ebuild
index 8be6295b690b..d28a74b09547 100644
--- a/media-gfx/mate-image-viewer/mate-image-viewer-1.6.2.ebuild
+++ b/media-gfx/mate-image-viewer/mate-image-viewer-1.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/media-gfx/mate-image-viewer/mate-image-viewer-1.6.2.ebuild,v 1.1 2014/03/19 16:24:25 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mate-image-viewer/mate-image-viewer-1.6.2.ebuild,v 1.2 2014/05/04 14:55:19 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X dbus exif jpeg lcms python svg tiff xmp"
 
diff --git a/media-libs/flac/flac-1.3.0.ebuild b/media-libs/flac/flac-1.3.0.ebuild
index fe4c4206c5dc..77a23495f8e9 100644
--- a/media-libs/flac/flac-1.3.0.ebuild
+++ b/media-libs/flac/flac-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/media-libs/flac/flac-1.3.0.ebuild,v 1.8 2014/04/20 11:23:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.0.ebuild,v 1.9 2014/05/04 08:33:11 ago Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -14,7 +14,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="3dnow altivec +cxx debug ogg sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.1.3[${MULTILIB_USEDEP}] )
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index acf3579ce3c2..05521555a722 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -2,3 +2,4 @@ DIST giflib-4.1.6.tar.bz2 506050 SHA256 e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a
 DIST giflib-4.2.3.tar.bz2 560968 SHA256 0ac8d56726f77c8bc9648c93bbb4d6185d32b15ba7bdb702415990f96f3cb766 SHA512 f582fafa3ccb0f9ae6f040df0e33469a26fb275437f8615c39af613523ef5f3b09003ed3419f62880200606edfbe08b5aa3ba18a4d615ecd8da27331aec16b36 WHIRLPOOL b23ef64d227eb5219a9a1143cdafea6cb0aea12409fc18a686d5bf2d5241f97ac1c8f8bb76b0c99a5fd60fcff45fc092a2226a6b54ee24a2ec3841765a102447
 DIST giflib-5.0.4.tar.bz2 629190 SHA256 7c78b2834256fcb7ff703d0d2153f965dc296f8e059de1fc635aba1042b00bba SHA512 057c7754a7169a8690d03b39e084626355e907dcc0644473da1ebe6c6f36c7d991a477c0b22d258bdbceafe473bab585bca57fa9bf4d9c0c4d7ebbe920bea83f WHIRLPOOL 91aad640c43581b9ff0daef2e8e909414419451590bbc372943275558724513cd3b1f081dc202498670c7d18cb22b48e067c79a157da6f597c8c56c737e07231
 DIST giflib-5.0.5.tar.bz2 651559 SHA256 606d8a366b1c625ab60d62faeca807a799a2b9e88cbdf2a02bfcdf4429bf8609 SHA512 3b8a5e3bd3ecd324073a635f76fbea218392644d11ca13918631a82339b3ef4567c57666ef777f684e3e81f39f04d8741e0973a538352f5bd17f5f15535a45c2 WHIRLPOOL 9fabcdbbee9dc08e17da7da6dabc61ca965ab631754f6f20c54953bb3b0f7763f6d0dc572c649e6ae9834bbcc03955aedee0ef6f2e0e09ec4e5bc46e223727ef
+DIST giflib-5.0.6.tar.bz2 621073 SHA256 8909839ccbdfca75cfbe6a4db907b55978e11fb268a8f3cde24bd923a0f669ea SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491 WHIRLPOOL e9c0bce41f36c00a87ce119310f39ae9ba8af8b7fa029ce8481d9ed81aa9ef1e417fb7236d5e3ea0c93d7b40ce07876100515051628b504506ec0d1fffe00bad
diff --git a/media-libs/giflib/giflib-5.0.6.ebuild b/media-libs/giflib/giflib-5.0.6.ebuild
new file mode 100644
index 000000000000..a2b376cf9eb7
--- /dev/null
+++ b/media-libs/giflib/giflib-5.0.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-5.0.6.ebuild,v 1.1 2014/05/03 09:02:53 radhermit Exp $
+
+EAPI=5
+
+inherit eutils libtool autotools-multilib
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="http://sourceforge.net/projects/giflib/"
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/6"
+# Needs testing first.
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140406-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	local myconfargs=(
+		$(use_enable static-libs static)
+	)
+	# No need for xmlto as they ship generated files.
+	ac_cv_prog_have_xmlto=no \
+		autotools-multilib_src_configure
+
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	# for static libs the .la file is required if built with +X
+	use static-libs || prune_libtool_files --all
+
+	doman doc/*.1
+	dodoc doc/*.txt
+	dohtml -r doc
+}
diff --git a/media-libs/grilo/grilo-0.2.10.ebuild b/media-libs/grilo/grilo-0.2.10.ebuild
index 1488d102cccb..98df7e7fe50e 100644
--- a/media-libs/grilo/grilo-0.2.10.ebuild
+++ b/media-libs/grilo/grilo-0.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/media-libs/grilo/grilo-0.2.10.ebuild,v 1.1 2014/03/29 19:24:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/grilo-0.2.10.ebuild,v 1.3 2014/05/04 12:11:04 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk examples +introspection +network playlist test vala"
 REQUIRED_USE="test? ( introspection )"
diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
new file mode 100644
index 000000000000..685cf8e82397
--- /dev/null
+++ b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild,v 1.2 2014/05/03 10:11:41 mgorny Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+S="${WORKDIR}/cmt/src"
+MY_P="cmt_src_${PV}"
+
+DESCRIPTION="CMT (computer music toolkit) LADSPA library plugins"
+HOMEPAGE="http://www.ladspa.org/"
+SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk[${MULTILIB_USEDEP}]"
+RDEPEND=""
+
+src_prepare() {
+	sed -i \
+		-e "/^CFLAGS/ s/-O3/${CFLAGS}/" \
+		-e 's|/usr/local/include||g' \
+		-e 's|/usr/local/lib||g' makefile \
+			|| die "sed makefile failed"
+	sed -i -e "s/^CXXFLAGS*/CXXFLAGS = ${CXXFLAGS} \$(INCLUDES) -Wall -fPIC\n#/" \
+		"${S}/makefile" || die "sed makefile failed (CXXFLAGS)"
+
+	cd "${S}" || die
+	epatch "${FILESDIR}/${P}-mallocstdlib.patch"
+	epatch "${FILESDIR}/${P}-respect-ldflags.patch"
+	epatch "${FILESDIR}/${P}-sa.patch"
+	use elibc_Darwin && epatch "${FILESDIR}/${P}-darwin.patch"
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CXX
+	emake PLUGIN_LIB="cmt.so"
+}
+
+multilib_src_install() {
+	insopts -m755
+	insinto /usr/$(get_libdir)/ladspa
+	doins *.so
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/ladspa/rdf/
+	doins "${FILESDIR}/cmt.rdf"
+
+	dodoc ../README
+	dohtml ../doc/*
+}
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 9188e76ab3b8..b3a721d0270f 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -2,3 +2,4 @@ DIST lcms-1.19.tar.gz 927752 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e317
 DIST lcms2-2.3.tar.gz 4461644 SHA256 3ea177bbde947be5b9256b817d1cf98ab9c67c558b35703c48f5dbf8e0afafe4 SHA512 a1aca550ce357b04379b3faa7c67b90a6c5fbbbc08b5a47f8802b3588846322f5c3bca53e66212c303927721ac43cac28ef0522298ae1b4f734d84a48eebc9d0 WHIRLPOOL 8bfdc5bf638589d69908e75a95cd148e0b656dc92a4020aba56a9e9f17b417a78cb0e863a8c3beafd0830a206dd440b817f03c20d64b8fb3457d9e95f23061c9
 DIST lcms2-2.4.tar.gz 4293291 SHA256 2a514d10eff26901505c191a15c2588c751eb7fb86577118f6c235aff0be37e8 SHA512 935105c396ca3ff00db6be18feb94883e40312010866e029d0bbdf340f7bc354d24d09697335304f8dfc93d41a4d10f7d186721553959091cee962610441bb6e WHIRLPOOL a99a2880176361d341a4a8b8bceb05e0f752462c4b9a57552d94520e425316fb844f3c9a91cccebaca3c426e7382dc4de45ccc12989959e4e3047030135a47fb
 DIST lcms2-2.5.tar.gz 7000396 SHA256 6727772b44470a2111dba53b9ce4c952b87e7d1b72a31c5ebdf44ba6eb0aa72b SHA512 c41daee7bb366eed940283d3760e5862d8d2bb6e465d1f712123449a2013431321155c8500dba4c4393a1e49fdef0bc2f5399e1573f0295cc0dac3fe88c60853 WHIRLPOOL 72512f300b03344da9a932ad10b723d830a549a977dcf6750b0d88ddd217693e93ae05b23e239ff984acf34375ea8895b187be57dff14448253881a7b8dd2414
+DIST lcms2-2.6.tar.gz 4583389 SHA256 5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1 SHA512 af2dd8829a5d8b280688bc247812829c885368951d385a23a1596cf8d0a7aed627c8faa35740073efc51a86ef5c900fc9bdb9dcdfad885fb8b1eae16953f9041 WHIRLPOOL 4fe1be53c48b0928bd474e05613c443eea49570a074d22b71863c485408523116927655b57d86bcb02aca85d9e06c0e26d9ee46bc7c4d746e91e951212de9e59
diff --git a/media-libs/lcms/lcms-1.19-r1.ebuild b/media-libs/lcms/lcms-1.19-r1.ebuild
index 252a207152d1..286d6d6c6948 100644
--- a/media-libs/lcms/lcms-1.19-r1.ebuild
+++ b/media-libs/lcms/lcms-1.19-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r1.ebuild,v 1.5 2014/04/26 22:12:14 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r1.ebuild,v 1.6 2014/05/03 17:45:16 floppym Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
 # autoreconf needs to update python macros for py3 support.
 AUTOTOOLS_AUTORECONF=1
diff --git a/media-libs/lcms/lcms-2.6.ebuild b/media-libs/lcms/lcms-2.6.ebuild
new file mode 100644
index 000000000000..ea5a9107bb92
--- /dev/null
+++ b/media-libs/lcms/lcms-2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.6.ebuild,v 1.1 2014/05/03 07:30:57 radhermit Exp $
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
+inherit autotools-multilib
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs +threads test tiff zlib"
+
+RDEPEND="jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/lcms2-${PV}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with jpeg)
+		$(use_with tiff)
+		$(use_with zlib)
+		$(use_with threads)
+	)
+	autotools-multilib_src_configure
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	if use doc; then
+		docinto pdf
+		dodoc doc/*.pdf
+	fi
+}
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.ebuild b/media-libs/libdvdnav/libdvdnav-4.2.1.ebuild
index 77739a0edf34..ec8bc653bacc 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-4.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/media-libs/libdvdnav/libdvdnav-4.2.1.ebuild,v 1.4 2014/04/23 09:38:06 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-4.2.1.ebuild,v 1.5 2014/05/04 08:25:43 ago Exp $
 
 EAPI=5
 
@@ -26,9 +26,9 @@ HOMEPAGE="http://dvdnav.mplayerhq.hu/"
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="amd64 hppa"
+	KEYWORDS="amd64 hppa x86"
 fi
 IUSE=""
 RDEPEND=">=media-libs/libdvdread-4.2[${MULTILIB_USEDEP}]
diff --git a/media-libs/libdvdread/libdvdread-4.2.1.ebuild b/media-libs/libdvdread/libdvdread-4.2.1.ebuild
index 69b2592b38d2..145ca3ac6b7b 100644
--- a/media-libs/libdvdread/libdvdread-4.2.1.ebuild
+++ b/media-libs/libdvdread/libdvdread-4.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/media-libs/libdvdread/libdvdread-4.2.1.ebuild,v 1.5 2014/04/23 09:36:23 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-4.2.1.ebuild,v 1.6 2014/05/04 08:25:40 ago Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
 	KEYWORDS=""
 fi
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index fe80e4e83c28..c8b91c47cae2 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -1,2 +1,3 @@
 DIST libhdhomerun_20130117.tgz 41931 SHA256 80c8abb889b642339c6e30695ea1a0fcaaf48b76bdeaf3b29245297a42eb3141 SHA512 7065f6a0fd7bf67cc62e3b9462887594f7f9ad1617c13aa0f4d9fc7798600488a13179328fab9321be91f198873f961242064c3bb7b9567c63a8b0443d3c04c4 WHIRLPOOL 5fde51e79c6021fd8dc737415175f5ab89e95f23460d4b5e18dc5e2af04d8a7ac3c4ab06f82d27e46260843e13fd24dd2eec99f8711955a26259c4997ff528c5
 DIST libhdhomerun_20130328.tgz 41931 SHA256 66fdf3785f12bc4bcd4a9a6d322a1ad762bedff1a0888531b0ac5476491e4ed0 SHA512 3adbc34fd0aa8c045d491a85aa43f54e728de0b3959af6c675917fca46a66f2625511d879e8277060a5cefedccddc4e9352b2b6c1c70995352f4e6df4b6958cc WHIRLPOOL 0bd8dcbb0cbe64625967afb4592815bcede48fc953771d1e9d26ef380df9289121801e73e4c765dcd19b825c40ee4757b06eb42ad54f8cd39af29bb4664fd5c3
+DIST libhdhomerun_20140121.tgz 47685 SHA256 a86308e7145c0cecb226ee913e7ce44258ef24fcba979d1f32dcff89022f9809 SHA512 bf7bfed024980b4a58d860b28194c6f3a394071ba1e3e25b46b2a20709e5de51fbb61779d46c9f1f01efd1553abf0332b3711afeb21479576f7f40da7f22eca1 WHIRLPOOL f5972c72a5e5eb708d4ada2eb0d09a409370c595ccd9da1d2b0f400e35c4ff41b828dd853116fe6c4c1ca725894423844e14dcf91e5c01d79454179b68c31014
diff --git a/media-libs/libhdhomerun/libhdhomerun-20140121.ebuild b/media-libs/libhdhomerun/libhdhomerun-20140121.ebuild
new file mode 100644
index 000000000000..3c15da9f1a94
--- /dev/null
+++ b/media-libs/libhdhomerun/libhdhomerun-20140121.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/media-libs/libhdhomerun/libhdhomerun-20140121.ebuild,v 1.1 2014/05/04 01:27:42 cardoe Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="SiliconDust HDHomeRun Utilties"
+HOMEPAGE="http://www.silicondust.com/support/hdhomerun/downloads/linux/"
+SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/dont-strip.patch"
+}
+
+src_configure() {
+	:
+}
+
+src_install() {
+	dobin hdhomerun_config
+	dolib libhdhomerun.so
+
+	insinto /usr/include/hdhomerun
+	doins *.h
+}
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild
index 74a93ee64c40..b9a40a4ce3d9 100644
--- a/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-1.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/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild,v 1.3 2014/04/30 10:38:47 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild,v 1.4 2014/05/04 08:25:58 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic
@@ -13,7 +13,7 @@ SRC_URI="http://www.surina.net/soundtouch/${P/lib}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="sse2 static-libs"
 
 DEPEND="virtual/pkgconfig"
diff --git a/media-libs/openal/openal-1.15.1-r2.ebuild b/media-libs/openal/openal-1.15.1-r2.ebuild
index f38167b5a28c..cf064b213868 100644
--- a/media-libs/openal/openal-1.15.1-r2.ebuild
+++ b/media-libs/openal/openal-1.15.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/media-libs/openal/openal-1.15.1-r2.ebuild,v 1.6 2014/04/20 11:28:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.15.1-r2.ebuild,v 1.7 2014/05/04 08:24:00 ago Exp $
 
 EAPI=5
 inherit cmake-multilib
@@ -13,7 +13,7 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="alsa coreaudio debug neon oss portaudio pulseaudio sse"
 
 RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opusfile/opusfile-0.5.ebuild b/media-libs/opusfile/opusfile-0.5.ebuild
index 707d023ca6c8..385b1216873f 100644
--- a/media-libs/opusfile/opusfile-0.5.ebuild
+++ b/media-libs/opusfile/opusfile-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/media-libs/opusfile/opusfile-0.5.ebuild,v 1.1 2014/04/27 18:34:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opusfile/opusfile-0.5.ebuild,v 1.2 2014/05/03 14:21:45 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="doc fixed-point +float +http static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-0.10.3.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-0.10.3.ebuild
index 98dd65ab9633..9dddda54b0a5 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-0.10.3.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-0.10.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-libs/qt-gstreamer/qt-gstreamer-0.10.3.ebuild,v 1.4 2014/03/10 13:20:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/qt-gstreamer-0.10.3.ebuild,v 1.5 2014/05/04 12:10:30 maekke Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ QT_MINIMAL="4.7.0"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
diff --git a/media-libs/sbc/sbc-1.2.ebuild b/media-libs/sbc/sbc-1.2.ebuild
index 701999ec5595..19d981d14ae6 100644
--- a/media-libs/sbc/sbc-1.2.ebuild
+++ b/media-libs/sbc/sbc-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/media-libs/sbc/sbc-1.2.ebuild,v 1.6 2014/04/20 11:23:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sbc/sbc-1.2.ebuild,v 1.7 2014/05/04 08:32:03 ago Exp $
 
 EAPI=5
 inherit eutils multilib multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86"
 IUSE="static-libs"
 
 # --enable-tester is building src/sbctester but the tarball is missing required
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
new file mode 100644
index 000000000000..fff08f066fea
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild,v 1.1 2014/05/03 10:34:42 mgorny Exp $
+
+EAPI=5
+inherit eutils multilib-minimal
+
+MY_P=${P/sdl-/SDL_}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+	"
+
+RDEPEND=">=media-libs/libsdl-1.2.10[${MULTILIB_USEDEP}]
+	flac? ( media-libs/flac[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( media-sound/fluidsynth[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mp3? (
+		mad? ( media-libs/libmad[${MULTILIB_USEDEP}] )
+		smpeg? ( >=media-libs/smpeg-0.4.4-r1[${MULTILIB_USEDEP}] )
+	)
+	mod? (
+		modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
+		mikmod? ( >=media-libs/libmikmod-3.1.10[${MULTILIB_USEDEP}] )
+	)
+	vorbis? (
+		media-libs/libvorbis[${MULTILIB_USEDEP}]
+		media-libs/libogg[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-sdl-20140406-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+	)"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-wav.patch \
+		"${FILESDIR}"/${P}-clang.patch \
+		"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch #445980
+	sed -i \
+		-e '/link.*play/s/-o/$(LDFLAGS) -o/' \
+		Makefile.in || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-dependency-tracking \
+		--disable-music-flac-shared \
+		--disable-music-fluidsynth-shared \
+		--disable-music-mod-shared \
+		--disable-music-mp3-shared \
+		--disable-music-ogg-shared \
+		$(use_enable wav music-wave) \
+		$(use_enable vorbis music-ogg) \
+		$(use_enable mikmod music-mod) \
+		$(use_enable modplug music-mod-modplug) \
+		$(use_enable flac music-flac) \
+		$(use_enable static-libs static) \
+		$(use_enable smpeg music-mp3) \
+		$(use_enable mad music-mp3-mad-gpl) \
+		$(use_enable timidity music-timidity-midi) \
+		$(use_enable fluidsynth music-fluidsynth-midi)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	if ! use static-libs ; then
+		remove_libtool_files --all
+	fi
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..870d127c0524
--- /dev/null
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild,v 1.1 2014/05/03 10:25:47 mgorny Exp $
+
+EAPI=5
+inherit eutils multilib-minimal
+
+MY_P=SDL2_mixer-${PV}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+	tremor? ( vorbis )
+	"
+
+RDEPEND="media-libs/libsdl2[${MULTILIB_USEDEP}]
+	flac? ( media-libs/flac[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( media-sound/fluidsynth[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mp3? (
+		mad? ( media-libs/libmad[${MULTILIB_USEDEP}] )
+		smpeg? ( media-libs/smpeg2[${MULTILIB_USEDEP}] )
+	)
+	mod? (
+		modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
+		mikmod? ( media-libs/libmikmod[${MULTILIB_USEDEP}] )
+	)
+	vorbis? (
+		tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] )
+		!tremor? (
+			media-libs/libvorbis[${MULTILIB_USEDEP}]
+			media-libs/libogg[${MULTILIB_USEDEP}] )
+	)"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--disable-sdltest \
+		--enable-music-cmd \
+		$(use_enable wav music-wave) \
+		$(use_enable mod music-mod) \
+		$(use_enable modplug music-mod-modplug) \
+		--disable-music-mod-modplug-shared \
+		$(use_enable mikmod music-mod-mikmod) \
+		--disable-music-mod-mikmod-shared \
+		$(use_enable midi music-midi) \
+		$(use_enable timidity music-midi-timidity) \
+		$(use_enable fluidsynth music-midi-fluidsynth) \
+		--disable-music-fluidsynth-shared \
+		$(use_enable vorbis music-ogg) \
+		$(use_enable tremor music-ogg-tremor) \
+		--disable-music-ogg-shared \
+		$(use_enable flac music-flac) \
+		--disable-music-flac-shared \
+		$(use_enable mp3 music-mp3) \
+		$(use_enable smpeg music-mp3-smpeg) \
+		--disable-music-mp3-smpeg-shared \
+		--disable-smpegtest \
+		$(use_enable mad music-mp3-mad-gpl)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	use static-libs || prune_libtool_files
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index cc5a5c05a804..b64ff97b0035 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -4,3 +4,4 @@ DIST fldigi-3.21.78.tar.gz 2644359 SHA256 ead27fa205eb3524ae60cb51d6716718544767
 DIST fldigi-3.21.79.tar.gz 2646946 SHA256 02abb5fb75c50a9b0912f9890084f24ab5b8eb2586d3d484098166375dd65d9f SHA512 67d5217be8125488bf6b9852fb44d4b25428ddcad99f4978065a894ba195ddf8682be0e1655f40db84a234d7d78c982c611e96d49574ab90c163ff1ad0beba0f WHIRLPOOL fc102c1e8c65d78cfc3be9e107af6edb4c6c4ab3c505af4497c6ffc69f63a2c45803cb1d57cae958b70e0258efda0e3d762bb527f269842f8dcfdf4aff529907
 DIST fldigi-3.21.80.tar.gz 2647886 SHA256 b3327a9edfe09c691d75a53efc76dc3c7bd53c22185e46e1487caade126e904f SHA512 9ad9ba06dd4e04c5bb2df7ca85c3f41e25228f9bd697488e835e04f09a397177ba2fb6159bbda8d9d4b82acdda09f3b626ac238da6a4bfcbefb7a0fb7cdb4fb3 WHIRLPOOL 9cd18d35017c1adf136546ed1784b2672b7b323e0a8c3697d283ab8ad2c3b91eeeeb1d68e9490707c80ed3aedf0b5275c3714735665fa356d33a0c5cebe3d753
 DIST fldigi-3.21.81.tar.gz 2651662 SHA256 a2d02b31e0e41b9b8fded44433f381f390347b30db8aee7610caa61516ea58c5 SHA512 d91114310635fc6ad0e41fc602077ea73ee30a61fa3e2d924c8fd8c8fbbba68a381afc16fe33ea9747855c81a0b7a5f389a22cb4500882e1fc0c6aed96391529 WHIRLPOOL 1951686809ba6ddc56bd98798b92496276c278ae5bb1cba9a72947a0812c687ad194578afd6623934c53870ac19243912f4431581f69c620475cc332d77a9033
+DIST fldigi-3.21.82.tar.gz 2652964 SHA256 1a7b86a1fdc163f908369ab9ee23410937597749d099477294dacd547f604ee0 SHA512 1960088a31420cdb4e44a0a94c696fae54b815ffa53abc0e4fea1b5f6f39fd414756590a09ab218c67a2b8ee6d6a3719e9c95e684eafadb1870dea034d6af835 WHIRLPOOL 1b39708837e908ee86dad4742aa8c21eed8be03ce2bdf243fd66013b54ccb41e2678327215e2082b4649d9ac82383b1db344f4d58690cbd3c3ee7f24cfef12c0
diff --git a/media-radio/fldigi/fldigi-3.21.82.ebuild b/media-radio/fldigi/fldigi-3.21.82.ebuild
new file mode 100644
index 000000000000..0b474918a82b
--- /dev/null
+++ b/media-radio/fldigi/fldigi-3.21.82.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/media-radio/fldigi/fldigi-3.21.82.ebuild,v 1.1 2014/05/04 13:03:42 tomjbe Exp $
+
+EAPI=4
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
+SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls portaudio pulseaudio sndfile"
+
+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 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf $(use_with sndfile) \
+		$(use_with portaudio) \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--disable-silent-rules \
+		--without-asciidoc
+}
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..9a44bd42f3d1
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild,v 1.1 2014/05/03 09:44:11 mgorny Exp $
+
+EAPI=5
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="Fluidsynth is a software real-time synthesizer based on the Soundfont 2 specifications."
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa dbus debug examples jack ladspa lash portaudio pulseaudio readline sndfile"
+
+RDEPEND=">=dev-libs/glib-2.6.5:2[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( >=media-sound/lash-0.5[${MULTILIB_USEDEP}] ) )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
+	ladspa? ( >=media-libs/ladspa-sdk-1.12[${MULTILIB_USEDEP}]
+		>=media-libs/ladspa-cmt-1.15[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.8[${MULTILIB_USEDEP}] )
+	portaudio? ( >=media-libs/portaudio-19_pre[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline[${MULTILIB_USEDEP}] )
+	sndfile? ( >=media-libs/libsndfile-1.0.18[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_configure() {
+	# autotools based build system has AC_CHECK_LIB(pthread, pthread_create) wrt
+	# bug #436762
+	append-flags -pthread
+
+	mycmakeargs=(
+		$(cmake-utils_use alsa enable-alsa)
+		$(cmake-utils_use dbus enable-dbus)
+		$(cmake-utils_use debug enable-debug)
+		$(cmake-utils_use jack enable-jack)
+		-Denable-ladcca=OFF
+		$(cmake-utils_use ladspa enable-ladspa)
+		$(cmake-utils_use sndfile enable-libsndfile)
+		$(cmake-utils_use portaudio enable-portaudio)
+		$(cmake-utils_use pulseaudio enable-pulseaudio)
+		$(cmake-utils_use readline enable-readline)
+		)
+
+	if use alsa; then
+		mycmakeargs+=( $(cmake-utils_use lash enable-lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	dodoc AUTHORS NEWS README THANKS TODO doc/*.txt
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/*.c
+	fi
+}
diff --git a/media-sound/fmtools/fmtools-2.0.7.ebuild b/media-sound/fmtools/fmtools-2.0.7.ebuild
index 071edc2c3960..959cc83130af 100644
--- a/media-sound/fmtools/fmtools-2.0.7.ebuild
+++ b/media-sound/fmtools/fmtools-2.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/media-sound/fmtools/fmtools-2.0.7.ebuild,v 1.2 2014/04/30 09:22:41 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fmtools/fmtools-2.0.7.ebuild,v 1.3 2014/05/04 08:26:12 ago Exp $
 
 EAPI=5
 
@@ -10,4 +10,4 @@ SRC_URI="http://benpfaff.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
diff --git a/media-sound/gnome-music/gnome-music-3.10.4.ebuild b/media-sound/gnome-music/gnome-music-3.10.4.ebuild
index d8d981cd9964..3183eab9442e 100644
--- a/media-sound/gnome-music/gnome-music-3.10.4.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.10.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/media-sound/gnome-music/gnome-music-3.10.4.ebuild,v 1.1 2014/04/17 13:05:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-music/gnome-music-3.10.4.ebuild,v 1.3 2014/05/04 12:11:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -19,7 +19,7 @@ IUSE+=" python_single_target_python3_2 +python_single_target_python3_3"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/media-sound/lash/lash-0.5.4-r2.ebuild b/media-sound/lash/lash-0.5.4-r2.ebuild
new file mode 100644
index 000000000000..e98390fb5726
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/lash-0.5.4-r2.ebuild,v 1.1 2014/05/03 08:27:56 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib-minimal python-single-r1
+
+DESCRIPTION="LASH Audio Session Handler"
+HOMEPAGE="http://www.nongnu.org/lash/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+RDEPEND="dev-libs/libxml2
+	media-sound/jack-audio-connection-kit
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib )
+	gtk? ( x11-libs/gtk+:2 )
+	python? ( ${PYTHON_DEPS} )
+	|| ( sys-libs/readline dev-libs/libedit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-1.3.40 )"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/texi2html/s:-number:&-sections:' \
+		docs/Makefile.am || die #422045
+
+	epatch \
+		"${FILESDIR}"/${P}-glibc2.8.patch \
+		"${FILESDIR}"/${P}-swig_version_comparison.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+multilib_src_configure() {
+	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
+	export ac_cv_prog_lash_texi2html=no #422045
+
+	# --enable-pylash would disable it
+	local myconf=()
+	if ! multilib_is_native_abi || ! use python; then
+		myconf+=( --disable-pylash )
+	fi
+
+	if ! multilib_is_native_abi; then
+		# disable remaining configure checks
+		myconf+=(
+			JACK_CFLAGS=' '
+			JACK_LIBS=' '
+			XML2_CFLAGS=' '
+			XML2_LIBS=' '
+
+			vl_cv_lib_readline=no
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable alsa alsa-midi) \
+		$(multilib_native_use_enable gtk gtk2) \
+		$(multilib_native_use_enable debug) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C liblash
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		# headers
+		emake -C lash DESTDIR="${D}" install
+		# library
+		emake -C liblash DESTDIR="${D}" install
+		# pkg-config
+		emake DESTDIR="${D}" install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	dohtml docs/lash-manual-html-*/lash-manual.html
+	prune_libtool_files --all # --all for _lash.la in python directory
+	use python && python_optimize
+}
diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild
index 894a6cffc5e6..0e9b231a8492 100644
--- a/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-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/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild,v 1.3 2014/05/02 13:09:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild,v 1.5 2014/05/04 12:11:19 pacho Exp $
 
 EAPI="5"
 inherit autotools eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
@@ -16,7 +16,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome
 gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
diff --git a/media-sound/rhythmbox/rhythmbox-3.0.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.0.2.ebuild
index 80811f5ce77c..a42b2bd735a8 100644
--- a/media-sound/rhythmbox/rhythmbox-3.0.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.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/media-sound/rhythmbox/rhythmbox-3.0.2.ebuild,v 1.1 2014/03/29 21:03:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.0.2.ebuild,v 1.3 2014/05/04 12:11:27 pacho Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
@@ -21,7 +21,7 @@ test +udev upnp-av visualizer webkit zeitgeist"
 # Let people emerge this by default, bug #472932
 IUSE+=" python_single_target_python3_2 +python_single_target_python3_3"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 REQUIRED_USE="
 	ipod? ( udev )
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 571eae6e6970..78716cb85e7c 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,2 +1,3 @@
 DIST yoshimi-1.0.0.tar.bz2 1424814 SHA256 4c0d6f5a8f856f05ff594cbac7d0dc113f1fccd20d33fd166308a71983d9b1ab SHA512 e6a67a167ff050c1dc2e2c17f687e343982b769a2bc3e0612f085fac882c982c2dd8afa8adf221c18fc85d7b658a24a3b3ebeaa58bd9e769c3f2dab00f265efd WHIRLPOOL b2321e8db999e82eec0fff83d28788fb5e3f0820b58b31398e62267c46674a3b32af050d44949a138fee54c2e0c0b158dc20c1a5cc4d73b2f83e1e66a1dd9a15
 DIST yoshimi-1.1.0.tar.bz2 2210595 SHA256 7be9e7730231f9d7aa8036a4fa429f58ae19e48bca3dd96a1c52298d17c06065 SHA512 a158a6fdd07e3d6dea30be8f110112dd60d8c07d333216e761cfe558cb6f138d1b8cb51f8ebb329514eb90b8d6eaff271b5350462d19b65e79a39ed82638243e WHIRLPOOL b97aa55cd150d063a9a13e14806e1486e728c94fddafaf7574940c318294749096c077c24fcd85039788597350f4ed3d154737e9dd0faf13255835913d114a1d
+DIST yoshimi-1.2.0.tar.bz2 2354987 SHA256 bd8e5d7ab40ee547b79a9202dcdd858f981049e959f5ff95daeeffde671a9b5c SHA512 1831608004e3cf3d5ec445ef9a86dc8b70d8cd394897756e5e8aed05dfdbc4acfe03b1064e4f02cb7504ef25cc487a92c8484a726dc999a47b52b9029ba355af WHIRLPOOL a8270c73f48443582018c0d0ded3be02198c81675c321f907cb268ccf56be85952ba0559026dc9aa95586686de5886dff6b711bf009ad98a4f41f852e3d7f338
diff --git a/media-sound/yoshimi/yoshimi-1.2.0.ebuild b/media-sound/yoshimi/yoshimi-1.2.0.ebuild
new file mode 100644
index 000000000000..4a13875ef5b3
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.2.0.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/media-sound/yoshimi/yoshimi-1.2.0.ebuild,v 1.1 2014/05/03 09:10:38 radhermit Exp $
+
+EAPI=5
+inherit eutils cmake-utils
+
+DESCRIPTION="A software synthesizer based on ZynAddSubFX"
+HOMEPAGE="http://yoshimi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mini-xml-2.5
+	>=media-libs/alsa-lib-1.0.17
+	media-libs/fontconfig
+	media-libs/libsndfile
+	>=media-sound/jack-audio-connection-kit-0.115.6
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../${PV}.notes"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${PN}-1.1.0-desktop-version.patch
+}
diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index 5097c631f484..79757eb28893 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -1,2 +1,3 @@
 DIST v4l-dvb-saa716x-0.0.1_p20130224.tar.gz 5025513 SHA256 862f019aa523bc75d6f5429ffdc2037e58a41cb7480f8ff45d0a793dff7ca434 SHA512 8d22cc1b4b0eab96fbb06639e31baaa2fc94640ad52175e8632a96885a2b1e96b554b91be1a8d342064c530a4aacc0b88a97b5fd61a56be1d5f29c85acfc65c1 WHIRLPOOL 6083f4ae9febfcc6f521e8949d1f12e886030ce5d7ba7898bc1aa387eec768c4d22d04527f5401694b9b70aecc3a7bd265095f20462f98c88ad5f7a86e932e06
 DIST v4l-dvb-saa716x-0.0.1_p20130802.tar.gz 10 SHA256 95618a58558dadbeb0135d3d99fd1f13f83afa2bb72529ed1785308cb3679c99 SHA512 51aabaef7db33a206ae056eb54dd739663bd3c2255abfd101e529d6708c49ca6e3be4b2a205c622b97ca2f69f7184ab4a7bbf203f2589a548599354e23ac0e93 WHIRLPOOL 60b0136a7a6b043154a5312b395e417c84dfa9743b45b85f1c479ded72e64dfc3eafe99b7082227ed568b4ec6ec0b3245f30786a4c62c5392d594d90eab7ed1b
+DIST v4l-dvb-saa716x-0.0.1_p20140322.tar.gz 5026505 SHA256 79ff65c1354506ffb951e23bc1667c372cf22e9eca8309f9b7486fcfec22ef29 SHA512 2b452f6951064f01e88ccf1a2a6f0c9db8ac96779f7b8d56d33cf387d6ed196922edf6b6234d5887ce9dfdb7013772dc874be5ad5893b8e92b23ffe1f2b5d6ea WHIRLPOOL c6f63e835a670455aa871d179283d283d1e3da23f83c868040a48a402178d73d0c7f44ee807076e3cbd72a7b3e1f050d3e6103d2a49c778eddfe19efdba815a7
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild
new file mode 100644
index 000000000000..deead6da81ce
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild,v 1.1 2014/05/04 11:43:07 hd_brummy Exp $
+
+EAPI=5
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD"
+HOMEPAGE="http://powarman.dyndns.org/hgwebdir.cgi/v4l-dvb-saa716x/"
+
+HG_REVISION="196681f1e154"
+HG_REVISION_DATE="20140322"
+
+SRC_URI="http://powarman.dyndns.org/hgwebdir.cgi/v4l-dvb-saa716x/archive/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+	epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+	epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+}
+
+src_compile() {
+	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+	CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${ROOT}"/usr/src/linux/
+	linux-mod_src_compile
+}
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 4d3d631d5070..6959bee63c71 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,2 +1,3 @@
 DIST bino-1.3.0.tar.xz 737544 SHA256 aaae2d8eb41f43f61bdac2f40e012a6eaa2ac2a1f6b37fd153dc90021b46cea8 SHA512 c19569827b335f8c09833c1c2c94f40a4b3fa661014926940ba8ecbfe0168ede68e83a2e2c6480949162211fbe73855c65d89afdf6e3cb0ba3145b63f33c1960 WHIRLPOOL 9cec7c9ee4d4191f6be500d984dfd5a059f8e487d1b585d1e205c27e4ff532563c0a557eb900b90c01052efff4924c7a1a844b57ee5e441050d1afec6c1ab97d
 DIST bino-1.4.2.tar.xz 794272 SHA256 6cd88eb16ffee30a3cbb9b5d313feb61b91068387ae846ff96d9e99dcb5c88b6 SHA512 5be3416fcd89410cc4892614f8322425de8896763f84102ed728dbc141deea7d74156c23b04df7633d05543e1da3dabc09eb57917cfa0913df8900d421d61100 WHIRLPOOL f9f575c9bcd1abc46d6f15bd8f11c589bc2de9ebbdc58e6602c17e0ae4048755a0f23c5c0c339b7730d20f175e0166cb24f497aeeb5290055a53d0289c80e8d4
+DIST bino-1.4.4.tar.xz 808536 SHA256 c3d9d9fdacdca2df628d0b70ac69f29a4abc0f17882621e377430d25d3d5be8f SHA512 6bd8351889b920cff1c23b7287a1055705ac038bfadd1678d111980a586de25b7388f2316c721dfb68da64397842bb53201fa2af14f53b83ed23e0b16ce62249 WHIRLPOOL bcd0b78aea3caeb8bb97ff3ec010e365f1ea4347a145d7ab2696d5c5e3497013b9dc5f67aeffd990e1dd50de5e759a858be703cbd9d140b84d23cd4bca487784
diff --git a/media-video/bino/bino-1.4.4.ebuild b/media-video/bino/bino-1.4.4.ebuild
new file mode 100644
index 000000000000..38ff0907f914
--- /dev/null
+++ b/media-video/bino/bino-1.4.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/bino/bino-1.4.4.ebuild,v 1.1 2014/05/02 20:13:59 swift Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+
+inherit autotools-utils flag-o-matic
+
+DESCRIPTION="Stereoscopic and multi-display media player"
+HOMEPAGE="http://bino3d.org/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc lirc"
+
+IUSE_VIDEO_CARDS="
+	video_cards_nvidia"
+IUSE+="${IUSE_VIDEO_CARDS}"
+
+LANGS="en bg de fr ru zh_CN"
+for X in ${LANGS} ; do
+	IUSE+=" linguas_${X}"
+done
+
+RDEPEND=">=media-libs/glew-1.6.0
+	>=media-libs/openal-1.15.1
+	dev-qt/qtgui:4
+	dev-qt/qtcore:4
+	dev-qt/qtopengl:4
+	>=media-libs/libass-0.9.9
+	>=virtual/ffmpeg-0.6.90
+	lirc? ( app-misc/lirc )
+	video_cards_nvidia? ( media-video/nvidia-settings )
+	virtual/libintl"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README README.Linux )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-lirc-detect.patch" # detect lirc
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with video_cards_nvidia xnvctrl)
+		$(use_with lirc liblircclient)
+		--without-equalizer
+		--htmldir=/usr/share/doc/${PF}/html
+	)
+	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" && append-ldflags "-I/usr/$(get_libdir)" && append-libs "Xext"
+	use lirc && append-cppflags "-I/usr/include/lirc"  && append-libs "lirc_client"
+
+	# Fix a compilation error because of a multiple definitions in glew
+	append-ldflags "-zmuldefs"
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	use doc || ( rm -rf "${D}"/usr/share/doc/${PF}/html && dohtml "${FILESDIR}/${PN}.html" )
+}
diff --git a/media-video/gnome-video-effects/gnome-video-effects-0.4.1.ebuild b/media-video/gnome-video-effects/gnome-video-effects-0.4.1.ebuild
index 63b45cda3483..7d286a2b49c6 100644
--- a/media-video/gnome-video-effects/gnome-video-effects-0.4.1.ebuild
+++ b/media-video/gnome-video-effects/gnome-video-effects-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/media-video/gnome-video-effects/gnome-video-effects-0.4.1.ebuild,v 1.1 2014/03/16 15:06:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-video-effects/gnome-video-effects-0.4.1.ebuild,v 1.3 2014/05/04 12:11:32 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeVideoEffects"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.8-r3.ebuild b/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.8-r3.ebuild
index 073c3abebb33..8c1086d03c9a 100644
--- a/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.8-r3.ebuild
+++ b/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.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/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.8-r3.ebuild,v 1.2 2014/04/30 09:55:41 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.8-r3.ebuild,v 1.3 2014/05/04 08:26:28 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 # Test is buggy : bug #186752
 # Tries to run intl-toolupdate without it being substituted from
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 471a600303e5..77b4cb15ac26 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,2 +1,3 @@
 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.tar.gz 507154 SHA256 41dcd3ccefbe218b7ccc47a7ac2577cf261f1ea10298f26ff16ffc353adf0f25 SHA512 ecb84f918b28b507c06cde680da5114fdf19b224a71e202d6f932de0e080e941f7977e590476eda9ffc9fc5839126b1f2d1056dd80039ced894281a51eebcf30 WHIRLPOOL c349a9f12b5966e57fa0b09811bbf3cf4a36abbb06b3df5cc3b9fa1b42efa7e902be9625b09e161d0250034aa05c3901db5ec9e24b8af554fb046ad725cda04a
diff --git a/media-video/movit/movit-1.1.1.ebuild b/media-video/movit/movit-1.1.1.ebuild
new file mode 100644
index 000000000000..2f4c5b6d22cb
--- /dev/null
+++ b/media-video/movit/movit-1.1.1.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.1.ebuild,v 1.1 2014/05/03 04:41:51 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/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 714133d31630..62e3b2878dc4 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -1,2 +1,3 @@
 DIST mplayer2-2.0_p20130126.tar.xz 1914780 SHA256 ed68090e1ed2698132065ab4567e2920a6fb9f2f0868efc172f612d6848919f5 SHA512 b54780a0a45619ababf874fe40797a6c73c4adea26469178bbd5bf3396cd1977631622a8e150c02b650cf4a415d1e5d80943fda1e50935d921328022187b65dc WHIRLPOOL b1876eece2223d1b1281aeb1043c1f436c518363a2e720a2eb6be92853cac3ed0dce16b3c4300acffe4746925831ccfddcc24553d5fdcac4cce385701d5625bf
 DIST mplayer2-2.0_p20130428.tar.xz 1911464 SHA256 41e54e6c86761196e111250fd6db79161bfd08f2cccf7d624e9b25b038fdf6c0 SHA512 da0101736b76535d38b1063c3ec7054003c8013f24df949bac26d51deebb41fcb6116af35d3b49bd6d9c1cc76842ab58c8e049a42e70dc5694058e3e6ed44bd8 WHIRLPOOL f97620ec26483e498d21b75fb533d09e41542ca18bb6a5a535c40c33fad34f745966f10a001026766610b6e40754dcecab3dc6292c00532437d2a92cb8d21079
+DIST mplayer2-2.0_p20131009.tar.xz 1907780 SHA256 c105b3804d4d66af29015d4ecd46abbdff75c39d78d5457c535519ecc4d3855a SHA512 8c072bf8fa6a908d3c587e5f26daa6a07098abc8dabd20f77b172e8de5537125873ac1cfc8f07e5616eb0b35aaa73fbab2b30e94a057d220c481dae7740cb3e6 WHIRLPOOL f595c4032371239f1f31f6356d5c7d07534fc8227ba3f1e1452b507ac64baec0747c80b067eaed5fbdc58ee957875a39d9d782eed45b6d797d9a283a34496b78
diff --git a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild
new file mode 100644
index 000000000000..b9b9c61a9c75
--- /dev/null
+++ b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.1 2014/05/02 19:28:40 maksbotan Exp $
+
+EAPI=5
+
+# https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+
+EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
+
+inherit toolchain-funcs flag-o-matic multilib eutils python-any-r1
+[[ ${PV} == *9999* ]] && inherit git-2
+
+NAMESUF="${PN/mplayer/}"
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayer2.org/"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="http://dev.gentoo.org/~maksbotan/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd
++dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca
+lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio
+pvr +quvi radio samba selinux +shm tga +threads +unicode v4l vcd vdpau +X xinerama
++xscreensaver +xv yuv4mpeg"
+IUSE+=" symlink"
+
+CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext sse sse2 ssse3"
+for x in ${CPU_FEATURES}; do
+	IUSE+=" ${x}"
+done
+
+REQUIRED_USE="
+	cddb? ( cdio network )
+	dvdnav? ( dvd )
+	enca? ( iconv )
+	lcms? ( opengl )
+	libass? ( iconv )
+	opengl? ( || ( aqua X ) )
+	portaudio? ( threads )
+	pvr? ( v4l )
+	radio? ( v4l || ( alsa oss ) )
+	v4l? ( threads )
+	vdpau? ( X )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+"
+
+RDEPEND+="
+	sys-libs/ncurses
+	sys-libs/zlib
+	X? (
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		opengl? ( virtual/opengl )
+		lcms? ( media-libs/lcms:2 )
+		vdpau? ( x11-libs/libvdpau )
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		xv? ( x11-libs/libXv )
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( media-libs/libbluray )
+	bs2b? ( media-libs/libbs2b )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
+	directfb? ( dev-libs/DirectFB )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? (
+		>=media-libs/libdvdread-4.1.3
+		dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	)
+	enca? ( app-i18n/enca )
+	gif? ( media-libs/giflib )
+	iconv? ( virtual/libiconv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? (
+		>=media-libs/libass-0.9.10[enca?,fontconfig]
+		virtual/ttf-fonts
+	)
+	libcaca? ( media-libs/libcaca )
+	lirc? ( app-misc/lirc )
+	mng? ( media-libs/libmng )
+	mp3? ( media-sound/mpg123 )
+	png? ( media-libs/libpng )
+	pnm? ( media-libs/netpbm )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
+	postproc? (
+		|| (
+			media-libs/libpostproc
+			media-video/ffmpeg:0
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mplayer )
+	>=virtual/ffmpeg-9[threads?,vdpau?]
+	symlink? ( !media-video/mplayer )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	dev-python/docutils
+	X? (
+		x11-proto/videoproto
+		x11-proto/xf86vidmodeproto
+		xinerama? ( x11-proto/xineramaproto )
+		xscreensaver? ( x11-proto/scrnsaverproto )
+	)
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+	)
+"
+DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf etc/codecs.conf )
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "git repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use !libass; then
+		ewarn
+		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+	fi
+
+	if use cpudetection; then
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
+		ewarn "included mainly for people who want to use the same"
+		ewarn "binary on another system with a different CPU architecture."
+		ewarn "MPlayer will already detect your CPU settings by default at"
+		ewarn "buildtime; this flag is used for runtime detection."
+		ewarn "You won't need this turned on if you are only building"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
+		ewarn "disabling this use flag."
+	fi
+
+	einfo "For various format support you need to enable the support on your ffmpeg package:"
+	einfo "    media-video/libav or media-video/ffmpeg"
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-py2compat.patch"
+	epatch_user
+
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
+		configure version.sh || die
+
+	sed -e 's/ $(INSTALLSTRIP)//' \
+		-e '/$(INSTALL) -d $(LIBDIR)/d' \
+		-i Makefile || die
+
+	if [[ -n ${NAMESUF} ]]; then
+		sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
+			-i configure || die
+		sed -e "s/mplayer/${PN}/" \
+			-i TOOLS/midentify.sh || die
+	fi
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	#####################
+	# Optional features #
+	#####################
+	# rtc is useless and /dev/rtc0 is only readable for root
+	myconf+=" --disable-rtc"
+	# SDL output is fallback for platforms where nothing better is available
+	myconf+=" --disable-sdl"
+	myconf+="
+		$(use_enable network networking)
+		$(use_enable joystick)
+	"
+	uses="bluray ftp vcd"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use ipv6 || myconf+=" --disable-inet6"
+	use quvi || myconf+=" --disable-libquvi"
+	use samba || myconf+=" --disable-smb"
+	use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+	########
+	# CDDA #
+	########
+	use cddb || myconf+=" --disable-cddb"
+	use cdio || myconf+=" --disable-libcdio"
+
+	################################
+	# DVD read, navigation support #
+	################################
+	#
+	# dvdread - accessing a DVD
+	# dvdnav - navigation of menus
+	#
+	# use external libdvdcss, dvdread and dvdnav
+	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
+
+	#############
+	# Subtitles #
+	#############
+	uses="enca libass"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	# iconv optionally can use unicode
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
+	use iconv && use unicode && myconf+=" --charset=UTF-8"
+	# obscure and not maintained feature
+	myconf+=" --disable-unrarexec"
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	# BSD legacy TV/radio support, FreeBSD actually supports V4L2, and V4L2 supports this chip.
+	myconf+=" --disable-tv-bsdbt848 --disable-radio-bsdbt848"
+	use dvb || myconf+=" --disable-dvb"
+	use pvr || myconf+=" --disable-pvr"
+	use v4l || myconf+=" --disable-tv --disable-tv-v4l2 --disable-v4l2"
+	if use radio; then
+		myconf+=" --enable-radio --enable-radio-capture"
+	else
+		myconf+=" --disable-radio-v4l2"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	# better demuxers and decoders are provided by libav and ffmpeg
+	uses="faad liba52 libdca libdv libnut libvorbis mad musepack speex theora tremor xanim xvid"
+	for i in ${uses}; do
+		myconf+=" --disable-${i}"
+	done
+	use mp3 || myconf+=" --disable-mpg123"
+	uses="gif jpeg mng png pnm tga"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+
+	#################
+	# Binary codecs #
+	#################
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+	################
+	# Video Output #
+	################
+	uses="directfb md5sum yuv4mpeg"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use libcaca || myconf+=" --disable-caca"
+	use postproc || myconf+=" --disable-libpostproc"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
+	uses="alsa jack ladspa portaudio"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bs2b || myconf+=" --disable-libbs2b"
+	#use openal && myconf+=" --enable-openal" # build fails
+	use oss || myconf+=" --disable-ossaudio"
+	use pulseaudio || myconf+=" --disable-pulse"
+
+	####################
+	# Advanced Options #
+	####################
+	use threads || myconf+=" --disable-pthreads"
+
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+	use shm || myconf+=" --disable-shm"
+
+	for i in ${CPU_FEATURES//+/}; do
+		myconf+=" $(use_enable ${i})"
+	done
+
+	use debug && myconf+=" --enable-debug=3"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	use X || myconf+=" --disable-x11"
+	uses="vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use opengl || myconf+=" --disable-gl"
+	use lcms || myconf+=" --disable-lcms2"
+	use xscreensaver || myconf+=" --disable-xss"
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	use aqua && myconf+=" --enable-macosx-bundle --enable-macosx-finder"
+
+	CFLAGS= LDFLAGS= ./configure \
+		--cc="$(tc-getCC)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--confdir="${EPREFIX}"/etc/${PN} \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		${myconf} || die
+
+	MAKEOPTS+=" V=1"
+}
+
+src_compile() {
+	default
+	use doc && emake -C DOCS/xml html-chunked
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
+		dodoc -r TOOLS DOCS/tech
+		dohtml -r DOCS/HTML/*
+	fi
+
+	newbin TOOLS/midentify.sh midentify${NAMESUF}
+
+	if [[ -n ${NAMESUF} ]]; then
+		mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
+
+		if use symlink; then
+			dosym ${PN} /usr/bin/mplayer
+			dosym midentify${NAMESUF} /usr/bin/midentify
+		fi
+	fi
+}
diff --git a/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild
index 18aeb7391529..da071a4fef48 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.41.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/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild,v 1.1 2014/02/22 11:14:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.41.0-r1.ebuild,v 1.3 2014/05/04 12:11:38 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug nls opengl"
 
 RDEPEND="
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index b577646ea53b..f9970a0cbc5b 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-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/media-video/transcode/transcode-1.1.7-r3.ebuild,v 1.3 2014/04/21 21:54:49 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r3.ebuild,v 1.4 2014/05/04 08:29:30 ago Exp $
 
 EAPI=5
 inherit eutils libtool multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://bitbucket/france/${PN}-tcforge/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid"
 
 RDEPEND="
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b3cf70a70074..6357daa6d937 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 02 May 2014 18:37:02 +0000
+Sun, 04 May 2014 15:07:28 +0000
diff --git a/metadata/glsa/glsa-201405-02.xml b/metadata/glsa/glsa-201405-02.xml
new file mode 100644
index 000000000000..18c875c15a92
--- /dev/null
+++ b/metadata/glsa/glsa-201405-02.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="201405-02">
+  <title>libSRTP: Denial of Service</title>
+  <synopsis>A vulnerability in libSRTP can result in a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild">libsrtp</product>
+  <announced>May 03, 2014</announced>
+  <revised>May 03, 2014: 1</revised>
+  <bug>472302</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-libs/libsrtp" auto="yes" arch="*">
+      <unaffected range="ge">1.4.4_p20121108-r1</unaffected>
+      <vulnerable range="lt">1.4.4_p20121108-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libSRTP is an Open-source implementation of the Secure Real-time
+      Transport Protocol.
+    </p>
+  </background>
+  <description>
+    <p>A flaw was found in how the crypto_policy_set_from_profile_for_rtp()
+      function applies cryptographic profiles to an srtp_policy in libSRTP.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could exploit this vulnerability to crash an
+      application linked against libSRTP, resulting in Denial of Service.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libSRTP users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=net-libs/libsrtp-1.4.4_p20121108-r1"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-2139">CVE-2013-2139</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 04 Feb 2014 14:44:21 +0000">Zlogene</metadata>
+  <metadata tag="submitter" timestamp="Sat, 03 May 2014 13:23:32 +0000">
+    BlueKnight
+  </metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201405-03.xml b/metadata/glsa/glsa-201405-03.xml
new file mode 100644
index 000000000000..f224738d7ccb
--- /dev/null
+++ b/metadata/glsa/glsa-201405-03.xml
@@ -0,0 +1,62 @@
+<?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="201405-03">
+  <title>WeeChat: Multiple vulnerabilities</title>
+  <synopsis>Two vulnerabilities have been found in WeeChat, the worst of which
+    may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">weechat</product>
+  <announced>May 03, 2014</announced>
+  <revised>May 03, 2014: 1</revised>
+  <bug>442600</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-irc/weechat" auto="yes" arch="*">
+      <unaffected range="ge">0.3.9.2</unaffected>
+      <vulnerable range="lt">0.3.9.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Wee Enhanced Environment for Chat (WeeChat) is a light and extensible
+      console IRC client.
+    </p>
+  </background>
+  <description>
+    <p>Two vulnerabilities have been discovered in WeeChat:</p>
+    
+    <ul>
+      <li>The hook_process() function does not properly handle shell expansions
+        (CVE-2012-5534).
+      </li>
+      <li>WeeChat does not properly decode colors which could cause a
+        heap-based buffer overflow (CVE-2012-5854).
+      </li>
+    </ul>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted script
+      or send messages with specially crafted colors, possibly resulting in
+      execution of arbitrary code with the privileges of the process, or a
+      Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All WeeChat users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-irc/weechat-0.3.9.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-5534">CVE-2012-5534</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-5854">CVE-2012-5854</uri>
+  </references>
+  <metadata tag="requester" timestamp="Wed, 21 Nov 2012 20:56:00 +0000">ackle</metadata>
+  <metadata tag="submitter" timestamp="Sat, 03 May 2014 13:54:42 +0000">ackle</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201405-04.xml b/metadata/glsa/glsa-201405-04.xml
new file mode 100644
index 000000000000..f2fb8bfef7a4
--- /dev/null
+++ b/metadata/glsa/glsa-201405-04.xml
@@ -0,0 +1,73 @@
+<?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="201405-04">
+  <title>Adobe Flash Player: Multiple vulnerabilities </title>
+  <synopsis>Multiple vulnerabilities have been found in Adobe Flash Player, the
+    worst of which could result in execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">adobe-flash</product>
+  <announced>May 03, 2014</announced>
+  <revised>May 03, 2014: 1</revised>
+  <bug>501960</bug>
+  <bug>504286</bug>
+  <bug>507176</bug>
+  <bug>508986</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-plugins/adobe-flash" auto="yes" arch="*">
+      <unaffected range="ge">11.2.202.356</unaffected>
+      <vulnerable range="lt">11.2.202.356</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 entice a user to open a specially crafted SWF
+      file using Adobe Flash Player, possibly resulting in execution of
+      arbitrary code with the privileges of the process or a Denial of Service
+      condition. Furthermore, a remote attacker may be able to bypass the Same
+      Origin Policy or read the clipboard via unspecified vectors.
+    </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.356"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0498">CVE-2014-0498</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0499">CVE-2014-0499</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0502">CVE-2014-0502</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0503">CVE-2014-0503</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0504">CVE-2014-0504</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0506">CVE-2014-0506</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0507">CVE-2014-0507</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0508">CVE-2014-0508</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0509">CVE-2014-0509</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0515">CVE-2014-0515</uri>
+  </references>
+  <metadata tag="requester" timestamp="Wed, 26 Feb 2014 14:21:18 +0000">
+    pinkbyte
+  </metadata>
+  <metadata tag="submitter" timestamp="Sat, 03 May 2014 18:43:48 +0000">
+    pinkbyte
+  </metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201405-05.xml b/metadata/glsa/glsa-201405-05.xml
new file mode 100644
index 000000000000..8a6be03fc900
--- /dev/null
+++ b/metadata/glsa/glsa-201405-05.xml
@@ -0,0 +1,77 @@
+<?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="201405-05">
+  <title>Asterisk: Denial of Service</title>
+  <synopsis>Multiple buffer overflows in Asterisk might allow remote attackers
+    to cause a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">asterisk</product>
+  <announced>May 03, 2014</announced>
+  <revised>May 03, 2014: 1</revised>
+  <bug>504180</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-misc/asterisk" auto="yes" arch="*">
+      <unaffected range="ge">11.8.1</unaffected>
+      <unaffected range="rge">1.8.26.1</unaffected>
+      <vulnerable range="lt">11.8.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Asterisk is an open source telephony engine and toolkit.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Asterisk. Please review
+      the CVE identifiers and Asterisk Project Security Advisories referenced
+      below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly cause a Denial of Service condition.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Asterisk 11.* users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-misc/asterisk-11.8.1"
+    </code>
+    
+    <p>All Asterisk 1.8.* users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-misc/asterisk-1.8.26.1"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://downloads.asterisk.org/pub/security/AST-2014-001.pdf">
+      AST-2014-001
+    </uri>
+    <uri link="http://downloads.asterisk.org/pub/security/AST-2014-002.pdf">
+      AST-2014-002
+    </uri>
+    <uri link="http://downloads.asterisk.org/pub/security/AST-2014-003.pdf">
+      AST-2014-003
+    </uri>
+    <uri link="http://downloads.asterisk.org/pub/security/AST-2014-004.pdf">
+      AST-2014-004
+    </uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-2286">CVE-2014-2286</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-2287">CVE-2014-2287</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-2288">CVE-2014-2288</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-2289">CVE-2014-2289</uri>
+  </references>
+  <metadata tag="requester" timestamp="Wed, 23 Apr 2014 19:55:21 +0000">
+    pinkbyte
+  </metadata>
+  <metadata tag="submitter" timestamp="Sat, 03 May 2014 18:50:01 +0000">
+    pinkbyte
+  </metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b3cf70a70074..073ce60e691b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 02 May 2014 18:37:02 +0000
+Sun, 04 May 2014 15:07:29 +0000
diff --git a/metadata/md5-cache/app-accessibility/orca-3.10.3 b/metadata/md5-cache/app-accessibility/orca-3.10.3
index 0b14b25541bb..40826f2e520b 100644
--- a/metadata/md5-cache/app-accessibility/orca-3.10.3
+++ b/metadata/md5-cache/app-accessibility/orca-3.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=Extensible screen reader that provides access to the desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Orca
 IUSE=python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
 RDEPEND=>=app-accessibility/at-spi2-atk-2.10:2 >=app-accessibility/at-spi2-core-2.10:2[introspection] >=dev-libs/atk-2.10 >=dev-libs/glib-2.28:2 >=dev-python/pygobject-3.10:3[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] >=x11-libs/gtk+-3.6.2:3[introspection] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-libs/atk[introspection] dev-python/pyatspi[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/setproctitle[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
 REQUIRED_USE=|| ( python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/3.10/orca-3.10.3.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bd778e13b5aaab45aaf954be6bf21834
+_md5_=10a117a24b819701f265d5e017aef0f5
diff --git a/metadata/md5-cache/app-admin/ansible-1.4.3 b/metadata/md5-cache/app-admin/ansible-1.4.3
deleted file mode 100644
index 5ef396f39b19..000000000000
--- a/metadata/md5-cache/app-admin/ansible-1.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/nose dev-vcs/git ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Radically simple deployment, model-driven configuration management, and command execution framework
-EAPI=5
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_6 python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/jinja dev-python/pyyaml dev-python/paramiko net-misc/sshpass virtual/ssh python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ansible/ansible/archive/v1.4.3.tar.gz -> ansible-1.4.3.tar.gz
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e55a555ef67b2c961162543d72120163
diff --git a/metadata/md5-cache/app-admin/ansible-1.4.5 b/metadata/md5-cache/app-admin/ansible-1.4.5
deleted file mode 100644
index 587884241f67..000000000000
--- a/metadata/md5-cache/app-admin/ansible-1.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-vcs/git ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Radically simple deployment, model-driven configuration management, and command execution framework
-EAPI=5
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ansible/ansible/archive/v1.4.5.tar.gz -> ansible-1.4.5.tar.gz
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e083b47c0d21a0d187962ddc4559e42d
diff --git a/metadata/md5-cache/app-admin/ansible-1.5.0 b/metadata/md5-cache/app-admin/ansible-1.5.0
deleted file mode 100644
index 44da180890fd..000000000000
--- a/metadata/md5-cache/app-admin/ansible-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-vcs/git ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Radically simple deployment, model-driven configuration management, and command execution framework
-EAPI=5
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ansible/ansible/archive/v1.5.0.tar.gz -> ansible-1.5.0.tar.gz
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2f0257e315e6c6cf85dafe20fa1ffa15
diff --git a/metadata/md5-cache/app-admin/ansible-1.5.3 b/metadata/md5-cache/app-admin/ansible-1.5.3
deleted file mode 100644
index bba47faf9be0..000000000000
--- a/metadata/md5-cache/app-admin/ansible-1.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-vcs/git ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Radically simple deployment, model-driven configuration management, and command execution framework
-EAPI=5
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ansible/ansible/archive/v1.5.3.tar.gz -> ansible-1.5.3.tar.gz
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=df1dac8abe311acfe672355082ec0c98
diff --git a/metadata/md5-cache/app-admin/ansible-1.5.5 b/metadata/md5-cache/app-admin/ansible-1.5.5
index c01c31fb5a3f..8060b9e11290 100644
--- a/metadata/md5-cache/app-admin/ansible-1.5.5
+++ b/metadata/md5-cache/app-admin/ansible-1.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=Radically simple deployment, model-driven configuration management,
 EAPI=5
 HOMEPAGE=http://ansible.com/
 IUSE=test python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible/archive/v1.5.5.tar.gz -> ansible-1.5.5.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2cd1d5f2365b0a40dbebfe8f2102d3bd
+_md5_=c6256c1148b756f00eff1c70083c1940
diff --git a/metadata/md5-cache/app-admin/mate-system-tools-1.6.0 b/metadata/md5-cache/app-admin/mate-system-tools-1.6.0
index a07498fcb92d..415dd3f42038 100644
--- a/metadata/md5-cache/app-admin/mate-system-tools-1.6.0
+++ b/metadata/md5-cache/app-admin/mate-system-tools-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tools aimed to make easy the administration of UNIX systems
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=caja nfs policykit samba
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=app-text/rarian:0 >=app-admin/system-tools-backends-2.10.1:0 dev-libs/atk:0 dev-libs/dbus-glib:0 >=dev-libs/glib-2.25.3:2 >=dev-libs/liboobs-1.1:0 >=sys-apps/dbus-0.32:0 sys-libs/cracklib:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 >=x11-libs/gtk+-2.19.7:2 virtual/libintl:0 caja? ( mate-base/mate-file-manager:0 ) nfs? ( net-fs/nfs-utils:0 ) policykit? ( mate-extra/mate-polkit:0 >=sys-auth/polkit-0.92:0 ) samba? ( >=net-fs/samba-3:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-system-tools-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=2d52557d07fc26d4d8376e468b22dbed
+_md5_=95436c5b5a5ba66a3f05ddd06a118a8b
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.53 b/metadata/md5-cache/app-admin/webapp-config-1.53
index fc1c0fc4feb0..a15c25d98202 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.53
+++ b/metadata/md5-cache/app-admin/webapp-config-1.53
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-text/xmlto userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DEPEND=app-text/xmlto userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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=Gentoo's installer for web-based applications
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/webapp-config/
-IUSE=+portage python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
+IUSE=+portage python_targets_python2_6 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=portage? ( sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
+RDEPEND=portage? ( sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.53.tar.bz2
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6bed8478ec868c7730918451a0550998
+_md5_=3a6f0ee525045ca3e372f0f12f8d8d79
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index 5f2f600f38ed..5bfa4b6d2871 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-text/xmlto userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-vcs/git
+DEPEND=app-text/xmlto userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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-vcs/git
 DESCRIPTION=Gentoo's installer for web-based applications
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/webapp-config/
-IUSE=+portage python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
+IUSE=+portage python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 LICENSE=GPL-2
-RDEPEND=portage? ( sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
+RDEPEND=portage? ( sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=fe54511ea8dd64714f3b62c1bc5ab0d5
+_md5_=9485b825ba085faeee0369f3b29faf75
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.98.1 b/metadata/md5-cache/app-antivirus/clamav-0.98.1
index 30f14bc49e1a..52b0cc1797d9 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.98.1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.98.1
@@ -4,10 +4,10 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=5
 HOMEPAGE=http://www.clamav.net/
 IUSE=bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtual/libiconv ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 sys-devel/libtool selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=mirror://sourceforge/clamav/clamav-0.98.1.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e21e6115d9836c8d07ca9d0aca607df
+_md5_=87fe513e79fc461c019411acad1bdbc4
diff --git a/metadata/md5-cache/app-arch/dpkg-1.17.8 b/metadata/md5-cache/app-arch/dpkg-1.17.8
index 224ae0abc1af..0ce26948ac75 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.17.8
+++ b/metadata/md5-cache/app-arch/dpkg-1.17.8
@@ -4,11 +4,11 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/dpkg
 IUSE=+bzip2 dselect +lzma nls test unicode +update-alternatives +zlib
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 lzma? ( app-arch/xz-utils ) zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
 REQUIRED_USE=dselect? ( nls )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.17.8.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0f6c46f8c1ca0e2e4a7ec7040acb1e1c
+_md5_=aacf2e00c563167662560c61d4af6b7b
diff --git a/metadata/md5-cache/app-arch/dpkg-1.17.9 b/metadata/md5-cache/app-arch/dpkg-1.17.9
index 8670727226f6..48c0166cce88 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.17.9
+++ b/metadata/md5-cache/app-arch/dpkg-1.17.9
@@ -4,11 +4,11 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/dpkg
 IUSE=+bzip2 dselect +lzma nls test unicode +update-alternatives +zlib
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 lzma? ( app-arch/xz-utils ) zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
 REQUIRED_USE=dselect? ( nls )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.17.9.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=fc4fae72ffcc0528cdb6f4d86d492850
+_md5_=40e6d11a31f13224074fb9617949d9af
diff --git a/metadata/md5-cache/app-arch/mate-file-archiver-1.6.1 b/metadata/md5-cache/app-arch/mate-file-archiver-1.6.1
index 2d036e5ec199..66b9f124ab48 100644
--- a/metadata/md5-cache/app-arch/mate-file-archiver-1.6.1
+++ b/metadata/md5-cache/app-arch/mate-file-archiver-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Engrampa archive manager for MATE
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=caja debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.21.4:2 >=dev-libs/glib-2.25.5:2 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/mate-file-manager-1.6:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-file-archiver-1.6.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=45956e7a4ffe7af4966258f92c40d053
+_md5_=f6860d7b697909d67f1c3f9f276ba148
diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.9 b/metadata/md5-cache/app-arch/pbzip2-1.1.9
new file mode 100644
index 000000000000..bd11f085f6f2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/pbzip2-1.1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static? ( app-arch/bzip2[static-libs(+)] )
+DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
+EAPI=5
+HOMEPAGE=http://compression.ca/pbzip2/
+IUSE=static symlink
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BZIP2
+RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
+SLOT=0
+SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.9/+download/pbzip2-1.1.9.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=dd51075f187dc917f5497ade8c846b37
diff --git a/metadata/md5-cache/app-backup/deja-dup-28.0 b/metadata/md5-cache/app-backup/deja-dup-28.0
index 59b1b772dd71..4a0516ebfde7 100644
--- a/metadata/md5-cache/app-backup/deja-dup-28.0
+++ b/metadata/md5-cache/app-backup/deja-dup-28.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret[vala] dev-libs/glib:2 dev-libs/libpeas x11-libs/gtk+
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/28/28.0/+download/deja-dup-28.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6720b32126c61abbe323a35573a2fced
diff --git a/metadata/md5-cache/app-backup/deja-dup-29.5 b/metadata/md5-cache/app-backup/deja-dup-29.5
index 5e49d5c622fa..1b682e4b7def 100644
--- a/metadata/md5-cache/app-backup/deja-dup-29.5
+++ b/metadata/md5-cache/app-backup/deja-dup-29.5
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/30/29.5/+download/deja-dup-29.5.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4ee381c13fe33198a67a7cb4354d16cd
diff --git a/metadata/md5-cache/app-backup/deja-dup-30.0 b/metadata/md5-cache/app-backup/deja-dup-30.0
index 14d3bd4a508e..1828bee7c9be 100644
--- a/metadata/md5-cache/app-backup/deja-dup-30.0
+++ b/metadata/md5-cache/app-backup/deja-dup-30.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simple backup tool using duplicity back-end
 EAPI=5
 HOMEPAGE=https://launchpad.net/deja-dup/
 IUSE=nautilus test debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.6:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) gnome-base/dconf gnome-base/gvfs[fuse]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/30/30.0/+download/deja-dup-30.0.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0f80800eda9e0511369959c426fa7e8d
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=31e225e9b834a68b7ec3e1467db72905
diff --git a/metadata/md5-cache/app-backup/duplicity-0.6.23-r1 b/metadata/md5-cache/app-backup/duplicity-0.6.23-r1
index 5e2309e32bf5..6fb8c744edfe 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.6.23-r1
+++ b/metadata/md5-cache/app-backup/duplicity-0.6.23-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Secure backup system using gnupg to encrypt data
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/duplicity/
 IUSE=s3 python_targets_python2_6 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=GPL-3
 RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/paramiko[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.launchpad.net/duplicity/0.6-series/0.6.23/+download/duplicity-0.6.23.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4ddee274dc78ca28b41afbf24655067a
+_md5_=be43b1b418494fc88c3cbcba40cc1f63
diff --git a/metadata/md5-cache/app-benchmarks/siege-3.0.6 b/metadata/md5-cache/app-benchmarks/siege-3.0.6
index babd34e9e457..a3635d2af356 100644
--- a/metadata/md5-cache/app-benchmarks/siege-3.0.6
+++ b/metadata/md5-cache/app-benchmarks/siege-3.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=A HTTP regression testing and benchmarking utility
 EAPI=4
 HOMEPAGE=http://www.joedog.org/JoeDog/Siege
 IUSE=ssl
-KEYWORDS=amd64 hppa ~mips ppc ~x86 ~x64-macos
+KEYWORDS=amd64 hppa ~mips ppc x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d )
 SLOT=0
 SRC_URI=http://www.joedog.org/pub/siege/siege-3.0.6.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6c9da32c87478791da8570969712425a
+_md5_=9329335cbcde68178fbf9418ce0169ab
diff --git a/metadata/md5-cache/app-crypt/gcr-3.10.1 b/metadata/md5-cache/app-crypt/gcr-3.10.1
index c33e8eadf67f..cc2eafcb71a5 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.10.1
+++ b/metadata/md5-cache/app-crypt/gcr-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.32:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) dev-libs/gobject-introspection-common dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.32:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) dev-libs/gobject-introspection-common dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/gcr/
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.32:2 >=de
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.10/gcr-3.10.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d50a10465271e5f12f6337821f5c09b1
diff --git a/metadata/md5-cache/app-crypt/gcr-3.12.0 b/metadata/md5-cache/app-crypt/gcr-3.12.0
index 35403512b95a..914e5fcffff1 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.12.0
+++ b/metadata/md5-cache/app-crypt/gcr-3.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.34:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.34:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/gcr/
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.34:2 >=de
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.12/gcr-3.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=192826b24d5de9849dfa651546748dd7
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.16 b/metadata/md5-cache/app-crypt/libsecret-0.16
index 0a95a909ac94..6f2316e43c12 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.16
+++ b/metadata/md5-cache/app-crypt/libsecret-0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.32.0:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 ) dev-libs/libxslt dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( dev-python/mock introspection? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) >=dev-libs/gjs-1.32 dev-python/pygobject:3 ) ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.32.0:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 ) dev-libs/libxslt dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( dev-python/mock introspection? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) >=dev-libs/gjs-1.32 dev-python/pygobject:3 ) ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Libsecret
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32.0:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) intros
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.16/libsecret-0.16.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a77022571cbe3e057e8c9dd9f43160c9
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18 b/metadata/md5-cache/app-crypt/libsecret-0.18
index 30c32f21a088..5235c4ba2a71 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 ) dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( dev-python/mock introspection? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) >=dev-libs/gjs-1.32 dev-python/pygobject:3 ) ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 ) dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( dev-python/mock introspection? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) >=dev-libs/gjs-1.32 dev-python/pygobject:3 ) ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Libsecret
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspe
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6b3666419065b2f784be7103104ceb5e
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.10.2-r1 b/metadata/md5-cache/app-crypt/seahorse-3.10.2-r1
index a94fc351a895..7926f5d4d18c 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.10.2-r1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.10.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-crypt/gcr-3.9.1:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6:= ) ldap? ( net-nds/openldap:= ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-crypt/gcr[vala] >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-crypt/gcr-3.9.1:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6:= ) ldap? ( net-nds/openldap:= ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-crypt/gcr[vala] >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A GNOME application for managing encryption keys
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=app-crypt/gcr-3.9.1:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6:= ) ldap? ( net-nds/openldap:= ) !<app-crypt/seahorse-plugins-2.91.0_pre20110114
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.10/seahorse-3.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b2d7f167c1544d124e48fce9d49cc6fe
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-2.6.3 b/metadata/md5-cache/app-doc/gnucash-docs-2.6.3
index df6a1e0b206e..1ffd885b4ff0 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-2.6.3
+++ b/metadata/md5-cache/app-doc/gnucash-docs-2.6.3
@@ -3,10 +3,10 @@ DEPEND=!<=app-office/gnucash-2.2.1 >=dev-libs/libxml2-2.5.10 dev-libs/libxslt ap
 DESCRIPTION=Documentation package for GnuCash
 EAPI=5
 HOMEPAGE=http://www.gnucash.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=!<=app-office/gnucash-2.2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/gnucash/gnucash-docs-2.6.3.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3532161b557f41ef51a528775c637624
+_md5_=0af1ee9204c9cd6010025e896ec74e49
diff --git a/metadata/md5-cache/app-editors/ghex-3.10.1 b/metadata/md5-cache/app-editors/ghex-3.10.1
index a82450e44f23..1be9b604bc5f 100644
--- a/metadata/md5-cache/app-editors/ghex-3.10.1
+++ b/metadata/md5-cache/app-editors/ghex-3.10.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=dev-
 DESCRIPTION=GNOME hexadecimal editor
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/ghex/3.10/ghex-3.10.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c086b9f29213a9db6375902ef6a64d23
+_md5_=8f62caffd1c9a5106626198ce1b992b0
diff --git a/metadata/md5-cache/app-editors/latexila-2.10.1 b/metadata/md5-cache/app-editors/latexila-2.10.1
index 8068cce7a91d..53666aaf3a3f 100644
--- a/metadata/md5-cache/app-editors/latexila-2.10.1
+++ b/metadata/md5-cache/app-editors/latexila-2.10.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/enchant >=app-text/gtkspell-3.0.4:3 >=dev-libs/glib-2.36:2 dev-libs/libgee:0 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6.0:3 >=x11-libs/gtksourceview-3.10.0:3.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/itstool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-text/enchant >=app-text/gtkspell-3.0.4:3 >=dev-libs/glib-2.36:2 dev-libs/libgee:0 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6.0:3 >=x11-libs/gtksourceview-3.10.0:3.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/itstool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Integrated LaTeX environment for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/LaTeXila
 IUSE=+latexmk rubber
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=app-text/enchant >=app-text/gtkspell-3.0.4:3 >=dev-libs/glib-2.36:2 dev-libs/libgee:0 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6.0:3 >=x11-libs/gtksourceview-3.10.0:3.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
+RDEPEND=app-text/enchant >=app-text/gtkspell-3.0.4:3 >=dev-libs/glib-2.36:2 dev-libs/libgee:0 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6.0:3 >=x11-libs/gtksourceview-3.10.0:3.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/2.10/latexila-2.10.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7f8c0f746673612adb5910dea341c56b
diff --git a/metadata/md5-cache/app-editors/mate-text-editor-1.6.2 b/metadata/md5-cache/app-editors/mate-text-editor-1.6.2
index b82d99e91017..a72688937fa2 100644
--- a/metadata/md5-cache/app-editors/mate-text-editor-1.6.2
+++ b/metadata/md5-cache/app-editors/mate-text-editor-1.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Pluma text editor for the MATE desktop
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=python spell debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.22:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.19:2 >=x11-libs/gtksourceview-2.9.7:2.0 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-2.15.4:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtk-2.12:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.9.2:2 )
 REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-text-editor-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8ceb750bfd7991342862b20d2080d2ed
+_md5_=2c18f2a04553c9be7559918270399b24
diff --git a/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12 b/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
index c6ce95cedd8b..651a2306ebeb 100644
--- a/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
+++ b/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-21
 DESCRIPTION=A mode for editing Visual Basic programs
 EAPI=5
 HOMEPAGE=http://www.emacswiki.org/emacs/VisualBasicMode
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.4.12.el.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=64308077cc9d14eee33017002949da7b
+_md5_=eedffb8d0aef76fedd0366622a950e5e
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r11 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r11
deleted file mode 100644
index d73f04c43fce..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r11
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c64f2df2be3f2c8a3723d8ad3c475d9b
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r12 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r12
deleted file mode 100644
index c82ed4e105fe..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r12
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3b7c58836f53d056f4aecad6c847cbdf
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r13 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r13
deleted file mode 100644
index 56c25aedc5b0..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r13
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2f09e752248c0bac0052f83b4224ef96
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r14 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r14
deleted file mode 100644
index 8468e490bc33..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r14
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=bad2d064d4b480022fc279142b911aeb
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r15 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r15
deleted file mode 100644
index 0269398be3ce..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r15
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8d8003d0ec21bf84c6d7a1383cac9414
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r16 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r16
deleted file mode 100644
index c149a7c05e71..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r16
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e71d5765d4a816ed207ebcfd88c51600
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r17 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r17
deleted file mode 100644
index 5bbc0276c1fa..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r17
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=750cc8604362c03a31fc230eb3082b57
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r18 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r18
deleted file mode 100644
index 3f50a7520547..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r18
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c22f178902ccb04c23e7742b962f9418
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r19 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r19
deleted file mode 100644
index 14213659c9b2..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r19
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=99fcdad874aa71d57f17b098e96a58d1
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r20 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r20
deleted file mode 100644
index 776a6855b7e3..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r20
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f4f49f9ad59a96ea875f19d49c0960e5
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r21 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r21
deleted file mode 100644
index 3353e3cc2c16..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r21
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5fe9fefdeb90e89662b6440b33530532
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r22 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r22
deleted file mode 100644
index da4b4e36e4ad..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20131008-r22
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)] >=sys-apps/file-5.18-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20131008.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f74c51cd7e261324dded6dc16a847a60
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406
deleted file mode 100644
index e09ef58b33cd..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 !abi_x86_32? ( !>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)] >=sys-apps/file-5.18-r1[abi_x86_32(-)] >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20140406.tar.xz
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1ae9df6819cfc3c0803a3dc5231974f1
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r1 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r1
index 99d7bd354721..ffed9fb4ec49 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r1
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 !abi_x86_32? ( !>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)] >=sys-apps/file-5.18-r1[abi_x86_32(-)] >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
+RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 !abi_x86_32? ( !>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)] >=sys-apps/file-5.18-r1[abi_x86_32(-)] >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.16
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20140406.tar.xz http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=92c8695317e7f96df1c9d0f4e4caf95e
+_md5_=c51f25dac7e9c30bb0abecc78437976a
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r2 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r2
deleted file mode 100644
index 8117476af5cc..000000000000
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 !abi_x86_32? ( !>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)] >=sys-apps/file-5.18-r1[abi_x86_32(-)] >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] >=media-libs/giflib-4.2.3-r1[abi_x86_32(-)] >=sys-libs/slang-2.2.4-r1[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20140406.tar.xz http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2
-_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=62bdc751aabbef853890962ea34ea362
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r3 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r3
index c13ad92a34ce..0b6099d2b300 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r3
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20140406-r3
@@ -6,9 +6,9 @@ HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 +development
 KEYWORDS=-* ~amd64
 LICENSE=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
-RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 !abi_x86_32? ( !>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)] >=sys-apps/file-5.18-r1[abi_x86_32(-)] >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] >=media-libs/giflib-4.2.3-r1[abi_x86_32(-)] >=sys-libs/slang-2.2.4-r1[abi_x86_32(-)] >=sys-apps/acl-2.2.52-r1[abi_x86_32(-)] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)] >=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)] >=virtual/acl-0-r2[abi_x86_32(-)] ) >=sys-libs/glibc-2.15
+RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 !abi_x86_32? ( !>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] ) abi_x86_32? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=virtual/libusb-0-r1:0[abi_x86_32(-)] >=virtual/libusb-1-r1:1[abi_x86_32(-)] || ( >=virtual/udev-206-r1[abi_x86_32(-)] ~virtual/udev-204[abi_x86_32(-)] ) >=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] || ( >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] ) >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)] >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)] >=dev-libs/json-c-0.11-r1[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)] >=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)] >=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] >=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)] >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)] >=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)] >=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)] dev-libs/libgcrypt:11[abi_x86_32(-)] >=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)] >=dev-libs/lzo-2.06-r1[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)] >=sys-apps/file-5.18-r1[abi_x86_32(-)] >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)] >=media-libs/giflib-4.2.3-r1[abi_x86_32(-)] >=sys-libs/slang-2.2.4-r1[abi_x86_32(-)] >=sys-apps/acl-2.2.52-r1[abi_x86_32(-)] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)] >=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)] >=virtual/acl-0-r2[abi_x86_32(-)] ) >=sys-libs/glibc-2.16
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20140406.tar.xz http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8491706e25293fcb7e5efee4cf4c4d00
+_md5_=0ae1ab7fb45dd91d3777f16232421c8b
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-compat-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-compat-20140406
index 61041f8e403e..cc7e5b56a8d0 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-compat-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-compat-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=32 bit lib-compat, and also libgcc_s and libstdc++ from gcc 3.3 and
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=multilib +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=GPL-2
 RDEPEND=multilib? ( sys-libs/libstdc++-v3[multilib] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-compat-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=781fd223cb819a21406f544208b399c1
+_md5_=a4f7a439208a7547d78d20e77010394d
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-cpplibs-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-cpplibs-20140406
index 1c3b6e4791be..8cc72e757bc5 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-cpplibs-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-cpplibs-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=+development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Boost-1.0 LGPL-2.1
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-cpplibs-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6e51b8556884075e5514ff0e16776b01
+_md5_=61210eb5b3a6e3d910fe78b4b51c6b7e
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-db-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-db-20140406
index 10efb7a33266..2e566e43838a 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-db-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-db-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=+development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-db-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2e0df95174019875a00a0008bcf92e50
+_md5_=9d9392e73f63e450e3301e34ad73a7fe
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-gstplugins-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-gstplugins-20140406
index 96f0439d66f8..90477c3eb372 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-gstplugins-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-gstplugins-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=+development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=GPL-2 LGPL-2 LGPL-2.1
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406 ~app-emulation/emul-linux-x86-db-20140406 ~app-emulation/emul-linux-x86-gtklibs-20140406 ~app-emulation/emul-linux-x86-medialibs-20140406 ~app-emulation/emul-linux-x86-soundlibs-20140406
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-gstplugins-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=11a3222a59891c00d77f3355770d5c60
+_md5_=785c893191735ec5473ff70a6aff7add
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-gtklibs-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-gtklibs-20140406
index a587284f9590..7515932c6c44 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-gtklibs-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-gtklibs-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406 ~app-emulation/emul-linux-x86-xlibs-20140406 ~app-emulation/emul-linux-x86-opengl-20140406 !abi_x86_32? ( !>=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)] !>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)] ) abi_x86_32? ( >=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)] >=x11-libs/cairo-1.12.16-r1[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.5-r1[abi_x86_32(-)] >=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)] >=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)] >=x11-libs/pango-1.36.2-r1[abi_x86_32(-)] >=x11-libs/pangox-compat-0.0.2-r1[abi_x86_32(-)] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-gtklibs-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=449b1483fdcd24c4a95f7d00124b9c8c
+_md5_=74e2686cba2dbc25c3b8abd3b173ede3
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-gtkmmlibs-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-gtkmmlibs-20140406
index 63a38f655619..8f220b368a3d 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-gtkmmlibs-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-gtkmmlibs-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=+development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=LGPL-2 LGPL-2.1 GPL-2
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406 ~app-emulation/emul-linux-x86-cpplibs-20140406 ~app-emulation/emul-linux-x86-gtklibs-20140406
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-gtkmmlibs-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=388e3d6e7388096c4de3de46966eae3a
+_md5_=78f5e207225527996c30c1af141d2d19
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-jna-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-jna-20140406
index f27050142e0b..c4078f883697 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-jna-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-jna-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=+development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=LGPL-2.1
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-jna-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d24452724e9a2c6b891d6e51bd0d2f53
+_md5_=68f8f99cab803d718f5a7bd6b5b56498
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-medialibs-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-medialibs-20140406
index 762fe38100f1..01136f290f37 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-medialibs-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-medialibs-20140406
@@ -4,7 +4,7 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )
 PDEPEND=~app-emulation/emul-linux-x86-soundlibs-20140406
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406 ~app-emulation/emul-linux-x86-xlibs-20140406 ~app-emulation/emul-linux-x86-db-20140406 !<=app-emulation/emul-linux-x86-sdl-20081109 !<=app-emulation/emul-linux-x86-soundlibs-20110101 abi_x86_32? ( >=media-libs/libvpx-1.2.0_pre[abi_x86_32(-)] >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)] >=media-sound/lame-3.99.5-r1[abi_x86_32(-)] >=media-libs/faac-1.28-r4[abi_x86_32(-)] >=media-libs/faad2-2.7-r3[abi_x86_32(-)] >=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)] >=media-libs/libcuefile-477-r1[abi_x86_32(-)] >=media-libs/libreplaygain-477-r1[abi_x86_32(-)] >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)] >=media-libs/libdca-0.0.5-r3[abi_x86_32(-)] >=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)] >=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)] >=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)] >=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)] >=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)] >=media-libs/libshout-2.3.1-r1[abi_x86_32(-)] >=media-libs/libsidplay-2.1.1-r3:2[abi_x86_32(-)] >=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)] >=media-libs/x264-0.0.20130731[abi_x86_32(-)] >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)] >=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)] >=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)] >=media-libs/libmms-0.6.2-r1[abi_x86_32(-)] >=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)] >=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)] >=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)] >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)] >=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)] >=dev-libs/libcdio-0.92[abi_x86_32(-)] >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)] >=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)] >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)] )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-medialibs-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5a5430781684afc2850f0be2fa2ed2a9
+_md5_=3360546d3baac175590bf79bd0c37b8e
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-motif-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-motif-20140406
index 71cc07b89889..48ccf7df6fd9 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-motif-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-motif-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=!abi_x86_32? ( LGPL-2+ MIT MOTIF ) abi_x86_32? ( metapackage )
 RDEPEND=!<app-emulation/emul-linux-x86-xlibs-20110129 !abi_x86_32? ( !x11-libs/motif[abi_x86_32(-)] ~app-emulation/emul-linux-x86-baselibs-20140406 ~app-emulation/emul-linux-x86-xlibs-20140406 ) abi_x86_32? ( x11-libs/motif:0[abi_x86_32(-)] x11-libs/motif:2.2[abi_x86_32(-)] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=!abi_x86_32? ( http://dev.gentoo.org/~pacho/emul/emul-linux-x86-motif-20140406.tar.xz )
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=772533e88dbe591f0ced2ce93e50303b
+_md5_=be3b6275907f210dd7ee32303fcb0f96
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-opengl-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-opengl-20140406
index 4a4bd3943203..00feb1fedf3f 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-opengl-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-opengl-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 +development
-KEYWORDS=-* ~amd64 ~amd64-linux
+KEYWORDS=-* amd64 ~amd64-linux
 LICENSE=!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )
 RDEPEND=>=app-emulation/emul-linux-x86-xlibs-20100611 !<app-emulation/emul-linux-x86-xlibs-20100611 media-libs/mesa !abi_x86_32? ( !media-libs/freeglut[abi_x86_32(-)] !media-libs/glew[abi_x86_32(-)] !media-libs/glu[abi_x86_32(-)] !media-libs/mesa[abi_x86_32(-)] ) abi_x86_32? ( media-libs/freeglut[abi_x86_32(-)] media-libs/glew[abi_x86_32(-)] media-libs/glu[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=!abi_x86_32? ( http://dev.gentoo.org/~pacho/emul/emul-linux-x86-opengl-20140406.tar.xz )
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c9c65aed9a8ecbb662b64d0b2bea33e8
+_md5_=91a5c0e4a3b794340ad77b8ad4debbed
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-qtlibs-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-qtlibs-20140406
index 8ce103f82f1a..196331918dee 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-qtlibs-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-qtlibs-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=gtkstyle +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=LGPL-2.1 GPL-3
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406 ~app-emulation/emul-linux-x86-medialibs-20140406 ~app-emulation/emul-linux-x86-opengl-20140406 gtkstyle? ( ~app-emulation/emul-linux-x86-gtklibs-20140406 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-qtlibs-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5bd91abe3c62805c7dfa166755ec5ce7
+_md5_=2a6ac10255a5d2082d055fead16fdaa0
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-sdl-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-sdl-20140406
index bed508673d58..a25ba36f338b 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-sdl-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-sdl-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=LGPL-2 LGPL-2.1 ZLIB
 RDEPEND=~app-emulation/emul-linux-x86-xlibs-20140406 ~app-emulation/emul-linux-x86-baselibs-20140406 ~app-emulation/emul-linux-x86-soundlibs-20140406 ~app-emulation/emul-linux-x86-medialibs-20140406 abi_x86_32? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-sdl-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=76569b75d746cbe1458594a09116aa7c
+_md5_=6064f76b3d59a4287e24b69d8bf7c647
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-sdl-20140406-r2 b/metadata/md5-cache/app-emulation/emul-linux-x86-sdl-20140406-r2
new file mode 100644
index 000000000000..114a01cb90e0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-sdl-20140406-r2
@@ -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=LGPL-2 LGPL-2.1 ZLIB
+RDEPEND=~app-emulation/emul-linux-x86-xlibs-20140406 ~app-emulation/emul-linux-x86-baselibs-20140406 ~app-emulation/emul-linux-x86-soundlibs-20140406 ~app-emulation/emul-linux-x86-medialibs-20140406 abi_x86_32? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)] >=media-libs/freealut-1.1.0-r3[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] >=media-libs/sdl-gfx-2.0.24-r1[abi_x86_32(-)] >=media-libs/sdl-image-1.2.12-r1[abi_x86_32(-)] >=media-libs/sdl-mixer-1.2.12-r4[abi_x86_32(-)] >=media-libs/sdl-net-1.2.8-r1[abi_x86_32(-)] >=media-libs/sdl-sound-1.0.3-r1[abi_x86_32(-)] >=media-libs/sdl-ttf-2.0.11-r1[abi_x86_32(-)] >=media-libs/smpeg-0.4.4-r10[abi_x86_32(-)] )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-sdl-20140406.tar.xz
+_eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=1f74a9ba8ec27faf654a75d2ba905b71
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20140406
index d2be2c0a47c6..6f7be337bd46 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 alsa +pulseaudio +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406[abi_x86_32=] ~app-emulation/emul-linux-x86-medialibs-20140406[abi_x86_32=] !abi_x86_32? ( !>=sci-libs/fftw-3.3.3-r1[abi_x86_32] !>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] ) abi_x86_32? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] >=media-libs/webrtc-audio-processing-0.1-r1[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.1-r1[abi_x86_32(-)] >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/audiofile-0.3.6-r1[abi_x86_32(-)] >=sci-libs/fftw-3.3.3-r1[abi_x86_32(-)] >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)] >=media-plugins/caps-plugins-0.4.5-r2[abi_x86_32(-)] >=media-plugins/swh-plugins-0.4.15-r3[abi_x86_32(-)] >=media-libs/libmikmod-3.2.0-r1[abi_x86_32(-)] >=media-plugins/alsaequal-0.6-r1[abi_x86_32(-)] >=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)] >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)] >=media-sound/musepack-tools-465-r1[abi_x86_32(-)] >=media-libs/libsndfile-1.0.25-r1[abi_x86_32(-)] >=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)] >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)] >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)] >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)] >=media-sound/mpg123-1.15.4-r1[abi_x86_32(-)] >=media-libs/libao-1.1.0-r1[abi_x86_32(-)] pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] ) )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-soundlibs-20140406.tar.xz
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2ace5b5d8485b2a7790080ad6b28210b
+_md5_=66e44ab735d62e5f484012cc8eb63eec
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-xlibs-20140406 b/metadata/md5-cache/app-emulation/emul-linux-x86-xlibs-20140406
index c3e98caa07da..0309a65060f9 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-xlibs-20140406
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-xlibs-20140406
@@ -4,11 +4,11 @@ DESCRIPTION=Provides precompiled 32bit libraries
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=abi_x86_32 opengl +development
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=!abi_x86_32? ( FTL GPL-2 MIT ) abi_x86_32? ( metapackage )
 RDEPEND=~app-emulation/emul-linux-x86-baselibs-20140406 x11-libs/libX11 opengl? ( app-emulation/emul-linux-x86-opengl ) !abi_x86_32? ( !media-libs/fontconfig[abi_x86_32(-)] !media-libs/freetype[abi_x86_32(-)] !x11-libs/libICE[abi_x86_32(-)] !x11-libs/libpciaccess[abi_x86_32(-)] !x11-libs/libSM[abi_x86_32(-)] !x11-libs/libvdpau[abi_x86_32(-)] !x11-libs/libX11[abi_x86_32(-)] !x11-libs/libXau[abi_x86_32(-)] !x11-libs/libXaw[abi_x86_32(-)] !x11-libs/libxcb[abi_x86_32(-)] !x11-libs/libXcomposite[abi_x86_32(-)] !x11-libs/libXcursor[abi_x86_32(-)] !x11-libs/libXdamage[abi_x86_32(-)] !x11-libs/libXdmcp[abi_x86_32(-)] !x11-libs/libXext[abi_x86_32(-)] !x11-libs/libXfixes[abi_x86_32(-)] !x11-libs/libXft[abi_x86_32(-)] !x11-libs/libXi[abi_x86_32(-)] !x11-libs/libXinerama[abi_x86_32(-)] !x11-libs/libXmu[abi_x86_32(-)] !x11-libs/libXp[abi_x86_32(-)] !x11-libs/libXpm[abi_x86_32(-)] !x11-libs/libXrandr[abi_x86_32(-)] !x11-libs/libXrender[abi_x86_32(-)] !x11-libs/libXScrnSaver[abi_x86_32(-)] !x11-libs/libXt[abi_x86_32(-)] !x11-libs/libXtst[abi_x86_32(-)] !x11-libs/libXv[abi_x86_32(-)] !x11-libs/libXvMC[abi_x86_32(-)] !x11-libs/libXxf86dga[abi_x86_32(-)] !x11-libs/libXxf86vm[abi_x86_32(-)] ) abi_x86_32? ( media-libs/fontconfig[abi_x86_32(-)] media-libs/freetype[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libpciaccess[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libvdpau[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXaw[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/libXcomposite[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdamage[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXfixes[abi_x86_32(-)] x11-libs/libXft[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXinerama[abi_x86_32(-)] x11-libs/libXmu[abi_x86_32(-)] x11-libs/libXp[abi_x86_32(-)] x11-libs/libXpm[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXt[abi_x86_32(-)] x11-libs/libXtst[abi_x86_32(-)] x11-libs/libXv[abi_x86_32(-)] x11-libs/libXvMC[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=!abi_x86_32? ( http://dev.gentoo.org/~pacho/emul/emul-linux-x86-xlibs-20140406.tar.xz )
 _eclasses_=emul-linux-x86	849070907fe4e8553daad52137b99265	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b4eb9c0a486e00f693df8fa93dc06d84
+_md5_=778e266938ce38a8d9174db95b9909e4
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.7 b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.7
index 1e6560f0fb39..c8efab14b081 100644
--- a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.7
+++ b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.10:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.10:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GLib and GObject mappings for libvirt
 EAPI=5
 HOMEPAGE=http://libvirt.org/git/?p=libvirt-glib.git
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.10
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-0.1.7.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9acde139644f4f2e668d5308d8ea927d
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.8 b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.8
index 7cf6cbd0948e..ec9de79ac1bd 100644
--- a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.8
+++ b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.38.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.38.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GLib and GObject mappings for libvirt
 EAPI=5
 HOMEPAGE=http://libvirt.org/git/?p=libvirt-glib.git
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-0.1.8.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=608571c47e16df59c09a26dbf2d0fdce
diff --git a/metadata/md5-cache/app-emulation/lxc-1.0.3 b/metadata/md5-cache/app-emulation/lxc-1.0.3
new file mode 100644
index 000000000000..9e2324ae0244
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-1.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=net-libs/gnutls sys-libs/libcap lua? ( >=dev-lang/lua-5.1 ) python? ( 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(-)] ) seccomp? ( sys-libs/libseccomp ) doc? ( app-text/docbook-sgml-utils ) >=sys-kernel/linux-headers-3.2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)] virtual/pkgconfig
+DESCRIPTION=LinuX Containers userspace utilities
+EAPI=5
+HOMEPAGE=http://lxc.sourceforge.net/
+IUSE=doc examples lua python seccomp python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=net-libs/gnutls sys-libs/libcap lua? ( >=dev-lang/lua-5.1 ) python? ( 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(-)] ) seccomp? ( sys-libs/libseccomp ) sys-apps/util-linux app-misc/pax-utils virtual/awk 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? ( || ( python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) ) || ( python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/lxc/lxc/archive/lxc-1.0.3.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8fa249860ea23125c5d96c19c6dfbd63
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.18 b/metadata/md5-cache/app-emulation/wine-1.7.18
new file mode 100644
index 000000000000..9e0c5fedbdc8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-1.7.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=media-libs/freetype-2.0.0[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] sys-libs/ncurses[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] sys-apps/dbus[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] media-libs/fontconfig[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] media-libs/openal[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins app-emulation/emul-linux-x86-medialibs[development] ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( x11-libs/libXcursor[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXi[abi_x86_32] x11-libs/libXxf86vm[abi_x86_32] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development] x11-libs/libXinerama[abi_x86_32] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development] media-libs/alsa-lib[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) opencl? ( virtual/opencl[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( virtual/glu[abi_x86_32] virtual/opengl[abi_x86_32] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development] media-sound/gsm[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] virtual/jpeg:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] media-libs/lcms:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] >=media-sound/mpg123-1.5.0[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] sys-devel/gettext[abi_x86_32] ) ) odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development] media-libs/mesa[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] >=media-sound/pulseaudio-4.0-r1[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( dev-libs/libxml2[abi_x86_32] dev-libs/libxslt[abi_x86_32] ) ) ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) ssl? ( app-emulation/emul-linux-x86-baselibs[development] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] media-libs/libpng:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] media-libs/libv4l[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] x11-libs/libXcomposite[abi_x86_32] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix
+EAPI=5
+HOMEPAGE=http://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=media-libs/freetype-2.0.0[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] sys-libs/ncurses[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] sys-apps/dbus[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] media-libs/fontconfig[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] media-libs/openal[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins app-emulation/emul-linux-x86-medialibs[development] ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( x11-libs/libXcursor[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXi[abi_x86_32] x11-libs/libXxf86vm[abi_x86_32] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development] x11-libs/libXinerama[abi_x86_32] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development] media-libs/alsa-lib[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) opencl? ( virtual/opencl[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( virtual/glu[abi_x86_32] virtual/opengl[abi_x86_32] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development] media-sound/gsm[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] virtual/jpeg:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] media-libs/lcms:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] >=media-sound/mpg123-1.5.0[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] sys-devel/gettext[abi_x86_32] ) ) odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development] media-libs/mesa[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] >=media-sound/pulseaudio-4.0-r1[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( dev-libs/libxml2[abi_x86_32] dev-libs/libxslt[abi_x86_32] ) ) ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) ssl? ( app-emulation/emul-linux-x86-baselibs[development] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] media-libs/libpng:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] media-libs/libv4l[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] x11-libs/libXcomposite[abi_x86_32] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.18.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=26b833a6e88889d30f3b75f9e2b50c41
diff --git a/metadata/md5-cache/app-i18n/ibus-1.4.1 b/metadata/md5-cache/app-i18n/ibus-1.4.1
index 4888dc41e3f4..1f48048f4836 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.4.1
+++ b/metadata/md5-cache/app-i18n/ibus-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) >=dev-lang/perl-5.8.1 dev-util/intltool virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) >=dev-lang/perl-5.8.1 dev-util/intltool virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ibus/
 IUSE=dconf doc +gconf gtk gtk3 +introspection nls +python vala +X
 KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) x11-apps/setxkbmap python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+RDEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) x11-apps/setxkbmap python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 REQUIRED_USE=|| ( gtk gtk3 X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.4.1.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=f15e18eb8dbe0438f785617b014ae5a1
diff --git a/metadata/md5-cache/app-i18n/ibus-1.4.2 b/metadata/md5-cache/app-i18n/ibus-1.4.2
index 3ce46beecc4f..ae9b1d735cd6 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.4.2
+++ b/metadata/md5-cache/app-i18n/ibus-1.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) >=dev-lang/perl-5.8.1 dev-util/intltool virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) >=dev-lang/perl-5.8.1 dev-util/intltool virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ibus/
 IUSE=dconf doc +gconf gtk gtk3 +introspection nls +python vala +X
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) x11-apps/setxkbmap python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+RDEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) x11-apps/setxkbmap python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 REQUIRED_USE=|| ( gtk gtk3 X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.4.2.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=2e70267dc9be810157b827e1ae7bfe42
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.2 b/metadata/md5-cache/app-i18n/ibus-1.5.2
index c4837ca60abe..44fde0f34a23 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.2
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes x11-libs/libnotify dconf? ( >=gnome-base/dconf-0.13.4 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes x11-libs/libnotify dconf? ( >=gnome-base/dconf-0.13.4 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gtk gtk3 X ) deprecated? ( python ) python? ( python_single_ta
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.5.2.tar.gz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a9d880d87a7a0719b7697231a0e32085
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.3 b/metadata/md5-cache/app-i18n/ibus-1.5.3
index 92f70c6b640b..a76539a28384 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.3
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes x11-libs/libnotify dconf? ( >=gnome-base/dconf-0.13.4 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes x11-libs/libnotify dconf? ( >=gnome-base/dconf-0.13.4 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gtk gtk3 X ) deprecated? ( python ) python? ( python_single_ta
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.5.3.tar.gz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=644d98718b5c9ee9b7205bb9660e8454
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.4-r1 b/metadata/md5-cache/app-i18n/ibus-1.5.4-r1
index 2de5ad893805..fbc7ff225fd8 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.4-r1
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes >=gnome-base/dconf-0.13.4 x11-libs/libnotify gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) wayland? ( dev-libs/wayland ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes >=gnome-base/dconf-0.13.4 x11-libs/libnotify gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) wayland? ( dev-libs/wayland ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gtk gtk3 X ) deprecated? ( python ) python? ( python_single_ta
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.5.4.tar.gz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f800e574363d6b724d10fd277a5b1695
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.5 b/metadata/md5-cache/app-i18n/ibus-1.5.5
index 768f571cbb02..3a74b0e22d19 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.5
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes >=gnome-base/dconf-0.13.4 x11-libs/libnotify gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) wayland? ( dev-libs/wayland ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes >=gnome-base/dconf-0.13.4 x11-libs/libnotify gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) wayland? ( dev-libs/wayland ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gtk gtk3 X ) deprecated? ( python ) python? ( python_single_ta
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.5.5.tar.gz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5c7672514f719c5d5e32277c898ae381
diff --git a/metadata/md5-cache/app-i18n/libskk-0.0.11 b/metadata/md5-cache/app-i18n/libskk-0.0.11
index dac250493c0a..ed69f1d636f3 100644
--- a/metadata/md5-cache/app-i18n/libskk-0.0.11
+++ b/metadata/md5-cache/app-i18n/libskk-0.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=4
 HOMEPAGE=https://github.com/ueno/libskk
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://github/ueno/libskk/libskk-0.0.11.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2bc6000c555a005c770ee4e1138ec0fd
diff --git a/metadata/md5-cache/app-i18n/libskk-0.0.12 b/metadata/md5-cache/app-i18n/libskk-0.0.12
index e423cf7f7718..d5107c136ac8 100644
--- a/metadata/md5-cache/app-i18n/libskk-0.0.12
+++ b/metadata/md5-cache/app-i18n/libskk-0.0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=4
 HOMEPAGE=https://github.com/ueno/libskk
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://github/ueno/libskk/libskk-0.0.12.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=273a90f794466232e20a6b4354d029fc
diff --git a/metadata/md5-cache/app-i18n/libskk-0.0.9 b/metadata/md5-cache/app-i18n/libskk-0.0.9
index d47badc21686..49484f7d09e6 100644
--- a/metadata/md5-cache/app-i18n/libskk-0.0.9
+++ b/metadata/md5-cache/app-i18n/libskk-0.0.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib dev-libs/libgee:0 dev-libs/json-glib >=dev-libs/gobject-introspection-0.9 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=dev-libs/glib dev-libs/libgee:0 dev-libs/json-glib >=dev-libs/gobject-introspection-0.9 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=4
 HOMEPAGE=https://github.com/ueno/libskk
 IUSE=nls static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib dev-libs/libgee:0 dev-libs/json-glib >=dev-libs/gobject-introspection-0.9 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) nls? ( virtual/libintl )
+RDEPEND=dev-libs/glib dev-libs/libgee:0 dev-libs/json-glib >=dev-libs/gobject-introspection-0.9 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://github/ueno/libskk/libskk-0.0.9.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=59bc16c9cb2608e04c329af1fee8c8fc
diff --git a/metadata/md5-cache/app-i18n/libskk-1.0.1 b/metadata/md5-cache/app-i18n/libskk-1.0.1
index 141836c08047..b9d0760910e5 100644
--- a/metadata/md5-cache/app-i18n/libskk-1.0.1
+++ b/metadata/md5-cache/app-i18n/libskk-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=5
 HOMEPAGE=https://github.com/ueno/libskk
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://bitbucket/libskk/libskk/downloads/libskk-1.0.1.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4c57641a5304f9a52f00ede0ebe0e347
diff --git a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.60
index 0cc3ec73dafb..b18efd8df5a7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdeclarative:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f9cef834c5159e3f88ba0d9094262706
diff --git a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.65
index b93f6f0bba7a..df0aefaa65a9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdeclarative:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9c1821696cf0257d07a611c720b68681
diff --git a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999 b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
index 71a035bb6d0e..219cd36bb57c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=df6e2f26f9bbe84d60fa471396c70cfa
diff --git a/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.60
index 9393967fd8dc..0393efb15581 100644
--- a/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.60
@@ -10,5 +10,5 @@ RDEPEND=~app-leechcraft/lc-core-0.6.60[postgres?,sqlite?] dev-qt/qtwebkit:4 virt
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a738d2718cadeb58e471d52ec180fc18
diff --git a/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.65
index 12e014dd3212..da389cd68365 100644
--- a/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.65
@@ -10,5 +10,5 @@ RDEPEND=~app-leechcraft/lc-core-0.6.65[postgres?,sqlite?] dev-qt/qtwebkit:4 virt
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c597b3bd665f9f95b2a2582c83de89a9
diff --git a/metadata/md5-cache/app-leechcraft/lc-aggregator-9999 b/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
index d7ea02feb925..d7cb7ff55792 100644
--- a/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999[postgres?,sqlite?] dev-qt/qtwebkit:4 virtual/leechcraft-downloader-http
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3a915e92fa2db2e8f00d37cc39aee4a4
diff --git a/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.60
index bdc988f00916..e56f366f2893 100644
--- a/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 sys-devel/gdb
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c23ab7c5cb23060276cad63377dc28d7
diff --git a/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.65
index dd2491c373b3..f63549baf4c4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 sys-devel/gdb
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=067809ae46a79f69cc445837d9086267
diff --git a/metadata/md5-cache/app-leechcraft/lc-anhero-9999 b/metadata/md5-cache/app-leechcraft/lc-anhero-9999
index f2751ea8a7cf..fc6273e7028b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-anhero-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-anhero-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 sys-devel/gdb
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3dee9b06458a511968aecb3c49a27e44
diff --git a/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.60
index fe594d556b5a..569f9c7347d2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=77da4e35e46215c28657744e67b40a90
diff --git a/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.65
index f72e8fa0d189..28f956806eee 100644
--- a/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=432ec8d6338a7dd34481604d1a4d485d
diff --git a/metadata/md5-cache/app-leechcraft/lc-auscrie-9999 b/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
index 3d26cd9e954c..ee08185bf72b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9a1c6dcb2d9500d37bdfbe97c81d5dcf
diff --git a/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.60
index ef0b1dd460dc..8a5469796daf 100644
--- a/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.60
@@ -10,5 +10,5 @@ RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-libs/qjson dev-qt/qtwebkit:4 autoidle
 REQUIRED_USE=|| ( standardstyles adiumstyles )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1b81cc11d60ac6d3200c318c6ad7263e
diff --git a/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.65
index ba2c229b1edb..61cb5a5c7c6f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.65
@@ -10,5 +10,5 @@ RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-libs/qjson dev-qt/qtwebkit:4 autoidle
 REQUIRED_USE=|| ( standardstyles adiumstyles )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b104fcd34f76a02b449fab98250c6047
diff --git a/metadata/md5-cache/app-leechcraft/lc-azoth-9999 b/metadata/md5-cache/app-leechcraft/lc-azoth-9999
index a82da6575808..6a1d89555a5b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-azoth-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-azoth-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/qjson dev-qt/qtwebkit:4 autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( dev-qt/qtmultimedia:4 ) msn? ( net-libs/libmsn ) woodpecker? ( dev-libs/kqoauth ) xmpp? ( =net-libs/qxmpp-9999 media? ( =net-libs/qxmpp-9999[speex] ) ) xtazy? ( ~app-leechcraft/lc-xtazy-9999 dev-qt/qtdbus:4 ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) spell? ( app-leechcraft/lc-rosenthal )
 REQUIRED_USE=|| ( standardstyles adiumstyles )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d24d5b06a34c5de1694af8058d13b74c
diff --git a/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.60
index cb100a676614..aa0399d0cfea 100644
--- a/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 net-libs/rb_libtorrent virtual/leechcraft-task-show geoip? ( dev-libs/geoip )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fe9110a16f2f246dcf791a7ada81f868
diff --git a/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.65
index d3425748f6c9..4d6a8550b0e1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 net-libs/rb_libtorrent virtual/leechcraft-task-show geoip? ( dev-libs/geoip )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=751b1ed69aa0090d86eb1f6a4b3fabb7
diff --git a/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999 b/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
index 9696f728132f..5b03abb620ed 100644
--- a/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
@@ -7,5 +7,5 @@ IUSE=debug geoip
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 net-libs/rb_libtorrent virtual/leechcraft-task-show geoip? ( dev-libs/geoip )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=22e599f90a2d0ef74ef47e43e4c4111d
diff --git a/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.60
index 659937e55d7b..de111a1aa0d1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 deathnote? ( dev-qt/qtxmlpatterns:4 ) spegnersi? ( dev-libs/kqoauth ) vangog? ( dev-libs/qjson )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=47446a4ff5903fa6214ceb4f9e3ef498
diff --git a/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.65
index 8b394a08651a..b6403fee823d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 deathnote? ( dev-qt/qtxmlpatterns:4 ) spegnersi? ( dev-libs/kqoauth ) vangog? ( dev-libs/qjson )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5ced4afe4d76f592e5a03501133cbc6b
diff --git a/metadata/md5-cache/app-leechcraft/lc-blasq-9999 b/metadata/md5-cache/app-leechcraft/lc-blasq-9999
index 2a22d507d7ed..cf3ca728363e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blasq-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-blasq-9999
@@ -7,5 +7,5 @@ IUSE=debug +deathnote +rappor +spegnersi +vangog
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 deathnote? ( dev-qt/qtxmlpatterns:4 ) spegnersi? ( dev-libs/kqoauth ) vangog? ( dev-libs/qjson )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=92f0e155b02b99481eddce3ff648ad6b
diff --git a/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.60
index eb7f8a909e0d..4167da78bed9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtsql:4[sqlite] metida? ( dev-qt/qtxmlpatterns:4 ) virtual/leechcraft-wysiwyg-editor
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b877f816d255c29de498ac07224ebb79
diff --git a/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.65
index f53ec10edd3e..ee9c054d77c1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtsql:4[sqlite] metida? ( dev-qt/qtxmlpatterns:4 ) virtual/leechcraft-wysiwyg-editor
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5ede8e1dec5685fffceb0f48dfd9d5ba
diff --git a/metadata/md5-cache/app-leechcraft/lc-blogique-9999 b/metadata/md5-cache/app-leechcraft/lc-blogique-9999
index a01cc8230926..358a8cc65da0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blogique-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-blogique-9999
@@ -7,5 +7,5 @@ IUSE=debug +metida +hestia
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtsql:4[sqlite] metida? ( dev-qt/qtxmlpatterns:4 ) virtual/leechcraft-wysiwyg-editor
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4b42c4d6a1921eac76f9048682d87256
diff --git a/metadata/md5-cache/app-leechcraft/lc-certmgr-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-certmgr-0.6.65
index c083181b1a32..d1712d626499 100644
--- a/metadata/md5-cache/app-leechcraft/lc-certmgr-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-certmgr-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fb62ff97e6bf6fd91b5d283cc30ed9ea
diff --git a/metadata/md5-cache/app-leechcraft/lc-certmgr-9999 b/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
index 26405f2eb2e6..fa3484b972e8 100644
--- a/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=64fb35b14374d47a0ed11265daaaa347
diff --git a/metadata/md5-cache/app-leechcraft/lc-core-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-core-0.6.60
index 0da7af973d56..ef63d29faa88 100644
--- a/metadata/md5-cache/app-leechcraft/lc-core-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-core-0.6.60
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.46 dev-qt/qtcore:4 dev-qt/qtdeclarative:4 dev-qt/qtgu
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=baf4a69cd9ab2f94bc88233167b015e2
diff --git a/metadata/md5-cache/app-leechcraft/lc-core-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-core-0.6.65
index a328b9e92420..f07caad3a1ba 100644
--- a/metadata/md5-cache/app-leechcraft/lc-core-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-core-0.6.65
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.46 dev-qt/qtcore:4 dev-qt/qtdeclarative:4 dev-qt/qtgu
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=794246e03ab5b77ffe07e7f0f1b68a56
diff --git a/metadata/md5-cache/app-leechcraft/lc-core-9999 b/metadata/md5-cache/app-leechcraft/lc-core-9999
index 256271e0ef02..9af8deed7527 100644
--- a/metadata/md5-cache/app-leechcraft/lc-core-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-core-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/boost-1.46 dev-qt/qtcore:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4[postgres?,sqlite?] dev-qt/qtwebkit:4 qwt? ( x11-libs/qwt:6 ) dev-qt/qtsvg:4 || ( kde-base/oxygen-icons x11-themes/kfaenza )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=408e2796b62489420dbf96daca1dbb50
diff --git a/metadata/md5-cache/app-leechcraft/lc-cpuload-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-cpuload-0.6.65
index bff313030a78..a81f5fcdabaa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cpuload-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-cpuload-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/leechcraft-quark-sideprovider
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=05671965468a17faa62955626caaa457
diff --git a/metadata/md5-cache/app-leechcraft/lc-cpuload-9999 b/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
index 674c409712c2..db1dac4ba684 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-quark-sideprovider
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8c01f4a5ee624c3a4117ad0f236f0de7
diff --git a/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.60
index f63eac4248c8..3c056ab3beae 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5a3a1659883f45fedb5825c99994d78f
diff --git a/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.65
index b7dd485606da..91635d6d8494 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=db7b8183448909f55acf99166751ec55
diff --git a/metadata/md5-cache/app-leechcraft/lc-cstp-9999 b/metadata/md5-cache/app-leechcraft/lc-cstp-9999
index 8427b233a748..2a6fecbb6699 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cstp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-cstp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-task-show
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e4de918c723959e03fa21799b7f0dc42
diff --git a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.60
index 2bfc386b6aef..6f734001b3cf 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9bcd85b89b27c2cb5836a089ff14addf
diff --git a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.65
index 9018b38b295a..23337a132e14 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=42bdf7b97a2fe50eeafa7782a5c1105c
diff --git a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999 b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
index 7a82bc037aaf..ab6ac1d7e81b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3c0f48ca490cf6a95455887009cda747
diff --git a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.60
index c3321b03b390..6e5e9985b470 100644
--- a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1c622d5d54fb11bfdb2261794f752d85
diff --git a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.65
index 9a56d9c1f596..4dae94924f20 100644
--- a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8a7d6b592e00256026ea238779e43ec7
diff --git a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999 b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
index fc63a2e299ca..4a0017eb8bc4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=89209228977bcd64747e3f2eb812a201
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.60
index 0908a2c985aa..8ec68517228a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ebd9dd00343cf0c2c56d282c748ca409
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.65
index ff8c7cec0a20..1e9d366c59c1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e08f8363702f9a2f82bf819bea481d35
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-9999 b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
index 561267fcafe9..34e39a5a7e8b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/udev
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fac041043bc5f7ab83896809c3cebd97
diff --git a/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.60
index c7cf85c49d3a..b2ca13a5a5c8 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d50d780668818e4f962efa732642ebb7
diff --git a/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.65
index e3230d23e8b0..283c329a1fbd 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9bec1b6fc0e91b023ff4f911350916f1
diff --git a/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999 b/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
index 0229cbc9b879..e404117340de 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=66a86fcb7b454f0b906f0284063e42ce
diff --git a/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.60
index 4928c7cf5b04..3a80a0bccacb 100644
--- a/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=36ac64cc080095a54e2f91f432ccba31
diff --git a/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.65
index 04e87c8e641d..1f61bec858c1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=43c85845e436582d5c7c4281f036203a
diff --git a/metadata/md5-cache/app-leechcraft/lc-fenet-9999 b/metadata/md5-cache/app-leechcraft/lc-fenet-9999
index 0950fb7eacab..ba6b5b0e31c9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-fenet-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-fenet-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=07801f2644506bfd2aeb042983c6855b
diff --git a/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.60
index 10243e820ff5..e786293b35d2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 x11-libs/libqxt
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=192120ef8f9685c23242ffa1ef87aa5b
diff --git a/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.65
index ef10b9745107..f9bde878c5a6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 x11-libs/libqxt
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bb73917a8551dbdd6713f944b7393050
diff --git a/metadata/md5-cache/app-leechcraft/lc-gacts-9999 b/metadata/md5-cache/app-leechcraft/lc-gacts-9999
index b43e399d36b3..92f7d9a447cb 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gacts-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-gacts-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/libqxt
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=620d34abd3b95075bb5aff6fcce80a2e
diff --git a/metadata/md5-cache/app-leechcraft/lc-glance-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-glance-0.6.60
index c3316f87693f..208fa28ab005 100644
--- a/metadata/md5-cache/app-leechcraft/lc-glance-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-glance-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=96b357372b2e34b2665e93323f01a45f
diff --git a/metadata/md5-cache/app-leechcraft/lc-glance-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-glance-0.6.65
index 0932a7f3d251..e4f958538188 100644
--- a/metadata/md5-cache/app-leechcraft/lc-glance-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-glance-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=92b50da67e23a6b2415969d861492927
diff --git a/metadata/md5-cache/app-leechcraft/lc-glance-9999 b/metadata/md5-cache/app-leechcraft/lc-glance-9999
index e8cd3a9200f9..78ab69b68441 100644
--- a/metadata/md5-cache/app-leechcraft/lc-glance-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-glance-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a0d725a078df4e5c6354f19a5057b6e3
diff --git a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.60
index 9b86e503783e..cde6aa9bcea2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdeclarative:4 quark? ( ~virtual/leechcraft-quark-sideprovider-0.6.60 ) notify? ( ~virtual/leechcraft-notifier-0.6.60 )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ed1225e1d3f96d4f40e32f27de474e53
diff --git a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.65
index 8b72f3daad19..3523799c82b2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdeclarative:4 quark? ( ~virtual/leechcraft-quark-sideprovider-0.6.65 ) notify? ( ~virtual/leechcraft-notifier-0.6.65 )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=373b0b7c9f875f6f156346c72136449a
diff --git a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999 b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
index c615cc2b4c97..2bfc22f3d16e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
@@ -7,5 +7,5 @@ IUSE=debug notify quark
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 quark? ( ~virtual/leechcraft-quark-sideprovider-9999 ) notify? ( ~virtual/leechcraft-notifier-9999 )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3b713ee97199e2626c9a0aa4c78f3129
diff --git a/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.60
index 83b5be28fb22..67cb87f8614b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 virtual/leechcraft-search-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=88fcc1fced1dcbc9bbb2951e0ce8cd58
diff --git a/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.65
index 173366d34272..88a9ec0137c7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/leechcraft-search-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=462973ac60657641f889d804f3eed7f9
diff --git a/metadata/md5-cache/app-leechcraft/lc-historyholder-9999 b/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
index 0b4d08014434..cfa3af727833 100644
--- a/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-search-show
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c392c1f4f51e14d996cca62d9fa0c09c
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.60
index df753640457d..eaf63e88ee3b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~app-leechcraft/lc-core-0.6.60[qwt] ~virtual/leechcraft-quark-sideprovider-0.6.60 dev-qt/qtdeclarative:4 sys-apps/lm_sensors
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0786100c324702bfc776152f8e998294
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.65
index ed33b5d98d3b..097e020a973a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~app-leechcraft/lc-core-0.6.65[qwt] ~virtual/leechcraft-quark-sideprovider-0.6.65 dev-qt/qtdeclarative:4 sys-apps/lm_sensors
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=531efe59e02bc1d32fcdbd8e3a87ce95
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999 b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
index b274a3b68791..e1a3f5a8b393 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~app-leechcraft/lc-core-9999[qwt] ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtdeclarative:4 sys-apps/lm_sensors
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dadca5b81dd1eb4913bda4fc644ba915
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.60
index 5ce5dcf4116e..e5634b249dc2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.60
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-libs/qjson
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f5a73b6fb0208fdb811c6bad27718d71
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.65
index 0485774a351f..a5b6e3025a0e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.65
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-libs/qjson
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ddc0f1b1495fbfd4dfa686950de496e1
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999 b/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
index a961f43567bd..55ff7ab7af86 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org/
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/qjson
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=98b2be58bfbe12c770477f77abba9b7d
diff --git a/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.60
index 158a0c58f637..3b7d91e347df 100644
--- a/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.60
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=65cc78da05c9ac0d60c6144e4c04b2d7
diff --git a/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.65
index 19a36ff6d721..0b30c88f4da0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.65
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0ddb7d05c845e79e0bd199e95c3c38f6
diff --git a/metadata/md5-cache/app-leechcraft/lc-htthare-9999 b/metadata/md5-cache/app-leechcraft/lc-htthare-9999
index 6a8cee760ee4..b93ab28fc1cd 100644
--- a/metadata/md5-cache/app-leechcraft/lc-htthare-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-htthare-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org/
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8781b4324aef5baf8ac6ee5cdfdb6e6a
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.60
index 0d002aa9a980..34ebb0d7bd5a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3f61d40b340bbf6db4d17ee29ac34b05
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.65
index 17e22b0e62c1..a99f0bd60108 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2ccba83b4138c3f03bec6dfcf8f0f1ff
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999 b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
index 3e7f85d026ff..b77ccdb04f62 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0e8ce893b444c22783d19dd489a355f1
diff --git a/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.60
index 00375ea360c2..4349a176564d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 x11-apps/setxkbmap
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8801baf5e17a8e4118e4517665ed1426
diff --git a/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.65
index d74a97c45cd4..b431849ee3a0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 x11-apps/setxkbmap
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9f643cb9a6b30ecaa63eb310cb5b396a
diff --git a/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999 b/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
index d1aabd9ff1f4..556c3b1bd959 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-apps/setxkbmap
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2bc8e722fb1b18ad1a74edc7e47401de
diff --git a/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.60
index 771c7180cc51..56a5e5ace67e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 >=dev-qt/qtwebkit-4.6:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8b58c456b587ea833ea6c12ff6376aca
diff --git a/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.65
index cef3b692eb27..b6e333c0d8dd 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 >=dev-qt/qtwebkit-4.6:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ad7cfa86fa0c16d774239f79f81a1cfc
diff --git a/metadata/md5-cache/app-leechcraft/lc-kinotify-9999 b/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
index 98741e79ed6d..f1600b883e9c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 >=dev-qt/qtwebkit-4.6:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=49f9dc879f712ebda2b11829c663b383
diff --git a/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.60
index 19f7329a956c..a489c485f2aa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2e1ad5e2b643dc376576ebbe1dbb3ed3
diff --git a/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.65
index 386a286709d7..dc271f40b04c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a865e6a83db18d28e25a8a4fdb834b27
diff --git a/metadata/md5-cache/app-leechcraft/lc-knowhow-9999 b/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
index 51b3e79987cf..3cf259fc508a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b2965004977bfc5a4b8d6bb7d0bbd9ba
diff --git a/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.60
index 377dfd732590..d90832cc4bca 100644
--- a/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdeclarative:4 x11-libs/libXcomposite ~virtual/leechcraft-quark-sideprovider-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dfc784428f610be76630498ce8d2fe16
diff --git a/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.65
index 7e96a5ba20c9..fdd8ee2da006 100644
--- a/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdeclarative:4 x11-libs/libXcomposite ~virtual/leechcraft-quark-sideprovider-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=82cee389256adaf177b18f2207ee2f02
diff --git a/metadata/md5-cache/app-leechcraft/lc-krigstask-9999 b/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
index fd273729b9ba..650af4e3c90f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 x11-libs/libXcomposite ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fef4c7991ffdb7e4fe8f47bcffd3f08b
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 d9bbb0ef17ed..d54baba03f82 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=29e603b896f44356bce613bbe45023bd
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 8bb58aa44665..3d0b6ab2b729 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9e70a59a2cc224208b87bab1dafb95e4
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-9999 b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
index bbfb0ab1e27e..b1fc76819500 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6b22310ac652abdf9658bb158f90f431
diff --git a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.60
index 0a71a7be73bb..ad781f41549a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 media-libs/liblastfm
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=359d0825bcf011004905d15ab62f9ceb
diff --git a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.65
index 4328c2ed68f1..2b45a5d72860 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 media-libs/liblastfm
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bae88401671fb58d017a82a50476d71c
diff --git a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999 b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
index aa965ea9691f..375de8102ec3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 media-libs/liblastfm
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=97076afe5dbb16798ebab7b0b3f08d84
diff --git a/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.60
index ac8c0d8f71d7..f4fd0ee30979 100644
--- a/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdbus:4 virtual/leechcraft-notifier
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5cd288388c580226b53f1088fee3e70a
diff --git a/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.65
index a35a83cce9db..d3ddddf8caad 100644
--- a/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdbus:4 virtual/leechcraft-notifier
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2ba67a2b1ae592a338194d212db514cf
diff --git a/metadata/md5-cache/app-leechcraft/lc-laughty-9999 b/metadata/md5-cache/app-leechcraft/lc-laughty-9999
index 2c53e80bb026..7717855b9e07 100644
--- a/metadata/md5-cache/app-leechcraft/lc-laughty-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-laughty-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4 virtual/leechcraft-notifier
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1f3fb60eb08df12c030187d868be0f3a
diff --git a/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.60
index 7855e0f64e47..9bc498763b77 100644
--- a/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.60
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdeclarative:4 ~virtual/leechcraft-trayarea-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=361717917f671af2e04fc2adec775be0
diff --git a/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.65
index c1e9aa7126e5..3553ce7b9c37 100644
--- a/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.65
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdeclarative:4 ~virtual/leechcraft-trayarea-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=75d43592ec88baf63cecd4e616058f3c
diff --git a/metadata/md5-cache/app-leechcraft/lc-launchy-9999 b/metadata/md5-cache/app-leechcraft/lc-launchy-9999
index 25d496b686c8..d7bdad484b18 100644
--- a/metadata/md5-cache/app-leechcraft/lc-launchy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-launchy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org/
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 ~virtual/leechcraft-trayarea-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=11e156d09a3387a36d13562b8858fd17
diff --git a/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.60
index bde765cc7987..40b889b49b2b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 ~virtual/leechcraft-quark-sideprovider-0.6.60 dev-qt/qtbearer:4 dev-qt/qtdeclarative:4 dev-libs/libnl:3 x11-libs/qwt:6
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fc01fadea58a72aae85a78f2948bd89e
diff --git a/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.65
index 4f8883e1bbea..35c5d6fc8c82 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 ~virtual/leechcraft-quark-sideprovider-0.6.65 dev-qt/qtbearer:4 dev-qt/qtdeclarative:4 dev-libs/libnl:3 x11-libs/qwt:6
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3d654f10822134ed5709b937f379a3d1
diff --git a/metadata/md5-cache/app-leechcraft/lc-lemon-9999 b/metadata/md5-cache/app-leechcraft/lc-lemon-9999
index 33b48479ff84..7f3036977e58 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lemon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lemon-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtbearer:4 dev-qt/qtdeclarative:4 dev-libs/libnl:3 x11-libs/qwt:6
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5490cc268d2859c0ab874ee1b5325107
diff --git a/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.60
index 05775b881042..aff66d829fda 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 app-text/htmltidy dev-qt/qtwebkit:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fac6fe4fcc73faccdbf60daaf2b03a58
diff --git a/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.65
index ae8d4dc816e2..3c68accd1a8b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 app-text/htmltidy dev-qt/qtwebkit:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=acc78065cbbd123951a8e00041ce04aa
diff --git a/metadata/md5-cache/app-leechcraft/lc-lhtr-9999 b/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
index 8af066614cb2..95c7e9b6873e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 app-text/htmltidy dev-qt/qtwebkit:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aa51cea0cda585fa726247d951f7a6d4
diff --git a/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.60
index 48ba0d137156..adfbbe7e8076 100644
--- a/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 sys-power/upower x11-libs/qwt:6 dev-qt/qtdbus:4 virtual/leechcraft-trayarea
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a5ef7af4f766141844f2afddf292ff81
diff --git a/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.65
index d3992ab148c1..d5798a81d366 100644
--- a/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 sys-power/upower x11-libs/qwt:6 dev-qt/qtdbus:4 virtual/leechcraft-trayarea
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=63acd05469c12a7a96406f514b7afcc4
diff --git a/metadata/md5-cache/app-leechcraft/lc-liznoo-9999 b/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
index 129e53d36745..de8375a26d9d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 sys-power/upower x11-libs/qwt:6 dev-qt/qtdbus:4 virtual/leechcraft-trayarea
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=85dd63ef712a142c2a7791b16604ea8f
diff --git a/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.60
index 59bc2238a974..c064eeb2a09b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 graffiti? ( media-libs/flac ) guess? ( app-i18n/libguess ) media-libs/gstreamer:0.10 media-libs/taglib mpris? ( dev-qt/qtdbus:4 ) dev-qt/qtdeclarative:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f2753cd0f5774f42f089e6792bc1faaa
diff --git a/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.65
index d676bed6ed14..0307f0a9ac00 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 graffiti? ( media-libs/flac ) guess? ( app-i18n/libguess ) media-libs/gstreamer:0.10 media-libs/taglib mpris? ( dev-qt/qtdbus:4 ) dev-qt/qtdeclarative:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=002c6a0e72cc740e875df73b67489a02
diff --git a/metadata/md5-cache/app-leechcraft/lc-lmp-9999 b/metadata/md5-cache/app-leechcraft/lc-lmp-9999
index c409d6ea6bc1..ac532e48d662 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lmp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lmp-9999
@@ -7,5 +7,5 @@ IUSE=debug +graffiti +guess +mpris +mp3tunes
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 graffiti? ( media-libs/flac ) guess? ( app-i18n/libguess ) media-libs/gstreamer:0.10 media-libs/taglib mpris? ( dev-qt/qtdbus:4 ) dev-qt/qtdeclarative:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=54464e3ef5517f3cbeb6800ad27336d0
diff --git a/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.60
index a47a646201fd..414eabe74d64 100644
--- a/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdeclarative:4 x11-libs/libXdamage x11-libs/libXrender ~virtual/leechcraft-quark-sideprovider-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e0ba6c4e9fabf5ce22acffffcac8250b
diff --git a/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.65
index bbe17ef559be..26ce4064a66f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdeclarative:4 x11-libs/libXdamage x11-libs/libXrender ~virtual/leechcraft-quark-sideprovider-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c97782a17aa7f3eb776adb4a202858fd
diff --git a/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999 b/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
index 5b4bff017f3f..466f2077a95b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 x11-libs/libXdamage x11-libs/libXrender ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=678948387dbb519eaa91fc715f2490b8
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.60
index 838db505b3d7..2fb97c2c4fdd 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 pdf? ( app-text/poppler[qt4] ) djvu? ( app-text/djvu ) spectre? ( app-text/libspectre || ( app-text/poppler[-lcms] <app-text/ghostscript-gpl-9.07 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b37f937431edc338fcabec476022ac27
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.65
index 77cca29cb186..ee68b0de4173 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 pdf? ( app-text/poppler[qt4] ) djvu? ( app-text/djvu ) spectre? ( app-text/libspectre || ( app-text/poppler[-lcms] <app-text/ghostscript-gpl-9.07 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1fd416a98a6471bd927b829091c45f94
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-9999 b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
index ed372f2af508..45015e6c82de 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
@@ -7,5 +7,5 @@ IUSE=debug +djvu doc +fb2 +pdf +spectre
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 pdf? ( app-text/poppler[qt4] ) djvu? ( app-text/djvu ) spectre? ( app-text/libspectre || ( app-text/poppler[-lcms] <app-text/ghostscript-gpl-9.07 ) )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dbbbbbc97d26d3320b6e773d8bb6db34
diff --git a/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.60
index 2aad7d851264..7498a28974d8 100644
--- a/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 acoustid? ( media-libs/chromaprint )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b9b1e8be155a8f002003cd0ed0a5a5f7
diff --git a/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.65
index 12b3640231ed..2c9077b9b12b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 acoustid? ( media-libs/chromaprint )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=db1a6c77aa6fe4dc500b818130998ae5
diff --git a/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999 b/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
index f2984e727795..e0cd49606819 100644
--- a/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
@@ -7,5 +7,5 @@ IUSE=debug acoustid
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 acoustid? ( media-libs/chromaprint )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b091110aa7e7b0f6bbf26035b8438a54
diff --git a/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.60
index c57a688d79ac..024a1182738e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9add3bc2cbaf43c9b47162d5798fde47
diff --git a/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.65
index 4ea513b34fe2..4b97cc251560 100644
--- a/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=750862f10bbce65e9fd90c8049429554
diff --git a/metadata/md5-cache/app-leechcraft/lc-nacheku-9999 b/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
index d0863e101f7e..cab5b7ccba67 100644
--- a/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6e1721079f2341d072dd91b378590a20
diff --git a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.60
index 3ac536869aa6..30e3194ea84b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 googledrive? ( dev-libs/qjson sys-apps/file )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f13d5ce9f7f7c5963e837e528caf052b
diff --git a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.65
index 244e303646e6..4bcd2824250a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 googledrive? ( dev-libs/qjson sys-apps/file )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2147fba3319123511f52b21f2df43281
diff --git a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999 b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
index 5973b7ff606c..315896db5744 100644
--- a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
@@ -7,5 +7,5 @@ IUSE=+googledrive +yandexdisk
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 googledrive? ( dev-libs/qjson sys-apps/file )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dd485a1192cffabb970bddf7644e0b27
diff --git a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.60
index ead79e2d2c46..79919bb078fd 100644
--- a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ca0fa453d6603875adcbdfb06feb1b89
diff --git a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.65
index 317b5060f3dd..5c1b299720e5 100644
--- a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8e419a1fd938abae3451d37eccacc9eb
diff --git a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999 b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
index b56f987326ca..8395e56aca97 100644
--- a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9eb87f55f0a2d90ef515412895dc3452
diff --git a/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.60
index 1215a72337bb..a760da2172d1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9f3f4153975b4cfd8484835b01f7ec43
diff --git a/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.65
index 50cc17ba32fe..c2a27774c555 100644
--- a/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=964644fe921501cde748c52b10391d68
diff --git a/metadata/md5-cache/app-leechcraft/lc-newlife-9999 b/metadata/md5-cache/app-leechcraft/lc-newlife-9999
index 7fc753edf683..1e8e08eaa1fb 100644
--- a/metadata/md5-cache/app-leechcraft/lc-newlife-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-newlife-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9009dbaabf3375f6e4c54e59ed555f32
diff --git a/metadata/md5-cache/app-leechcraft/lc-ooronee-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-ooronee-0.6.65
index bd2a259991fb..c1fedd81ad3a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-ooronee-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-ooronee-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/leechcraft-quark-sideprovider
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aec50c18a6e0f8820f66f02b114cca54
diff --git a/metadata/md5-cache/app-leechcraft/lc-ooronee-9999 b/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
index d132d1b5be47..302a8e7778f0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-quark-sideprovider
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=96b1ab858dc866395adcc2f4a73f7b14
diff --git a/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.60
index 6933ccdaeaf7..a45975995ee1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 app-leechcraft/liblaretz >=dev-qt/qtgui-4.8:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d84d3942c4dc9bf19f75124fe6e68cf2
diff --git a/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.65
index 3c25bffaf395..b3ad376f3233 100644
--- a/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 app-leechcraft/liblaretz >=dev-qt/qtgui-4.8:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8c0158a13c092db1e6d003b1cfa42dde
diff --git a/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999 b/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
index 00377c3efd70..4feaf94c33c6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 ~app-leechcraft/liblaretz-9999 >=dev-qt/qtgui-4.8:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d63a0ca1c3d5933ab0940ecd809d23ee
diff --git a/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.60
index 0c8774c2ad5c..3767700b881f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=378926a380f8ebc16b76320e128a5bd1
diff --git a/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.65
index 1fb64b5b51a6..8641dd04bed3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8e211c1999c5048fe0f8de8e702b535c
diff --git a/metadata/md5-cache/app-leechcraft/lc-pintab-9999 b/metadata/md5-cache/app-leechcraft/lc-pintab-9999
index f4fea0b13ea7..b73e7a921799 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pintab-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-pintab-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dff95e08eda5b02aba5cd042129d5cdd
diff --git a/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.60
index 602cecb9afa1..89d1deda93e3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.60
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=12f94413be5ac9eac73e82240eca4568
diff --git a/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.65
index 5ff75e426cc9..8f18a6c21eac 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.65
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2557f5170ab2d611743ab14c2fae4f56
diff --git a/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999 b/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
index bae9ef7018bb..a8d696351e0d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org/
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3e907f97dcc33cabcca264d5a17df6e8
diff --git a/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.60
index ec47f99cf74c..acdc8b7b2bab 100644
--- a/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 x11-libs/qscintilla
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=42514327809d871d422306c2863dc44f
diff --git a/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.65
index c9af5a281faa..22270ad10a3d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 x11-libs/qscintilla
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=97d44b19757c9ae21c87bd56aa96560c
diff --git a/metadata/md5-cache/app-leechcraft/lc-popishu-9999 b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
index 2ab0c2aed363..541109f79982 100644
--- a/metadata/md5-cache/app-leechcraft/lc-popishu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/qscintilla
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=084c6c6908b494252eb66fd4325aaef1
diff --git a/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.60
index 290b12eb3f55..2877626830d6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.60
@@ -10,5 +10,5 @@ RDEPEND=~app-leechcraft/lc-core-0.6.60[postgres?,sqlite?] dev-qt/qtwebkit:4 idn?
 REQUIRED_USE=pcre? ( cleanweb )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=da85f4f64baf658f784c8f8d1f60b261
diff --git a/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.65
index c67652e2be84..6cc8a73d5b6b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.65
@@ -10,5 +10,5 @@ RDEPEND=~app-leechcraft/lc-core-0.6.65[postgres?,sqlite?] dev-qt/qtwebkit:4 idn?
 REQUIRED_USE=pcre? ( cleanweb )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=401fe2c2c2176def23252e3f574a3722
diff --git a/metadata/md5-cache/app-leechcraft/lc-poshuku-9999 b/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
index 81565ec21a68..fd5c2b9fa522 100644
--- a/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999[postgres?,sqlite?] dev-qt/qtwebkit:4 idn? ( net-dns/libidn ) onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) pcre? ( >=dev-libs/libpcre-8.12 ) virtual/leechcraft-downloader-http
 REQUIRED_USE=pcre? ( cleanweb )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5aaad0302619f3f75e34bdc3050cea62
diff --git a/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.60
index 18cd5d9f9b17..7444d6d7e308 100644
--- a/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-libs/qjson dev-libs/qrosscore
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c22306b6fc7da155f6907a4e8525d203
diff --git a/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.65
index e49dda296f78..be5b4c5a754a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-libs/qjson dev-libs/qrosscore
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=60f764fee9de9853b9d9e04fe19b951d
diff --git a/metadata/md5-cache/app-leechcraft/lc-qrosp-9999 b/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
index 59fc04cf4a77..593c87863c64 100644
--- a/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/qjson dev-libs/qrosscore
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b00491d50aa98000cbb054885fe46118
diff --git a/metadata/md5-cache/app-leechcraft/lc-rosenthal-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-rosenthal-0.6.65
index d773a9248940..9d2f9ebd7c58 100644
--- a/metadata/md5-cache/app-leechcraft/lc-rosenthal-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-rosenthal-0.6.65
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 app-text/hunspell
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1d8e3d8ffa7b0a645dda65197c38ae31
diff --git a/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999 b/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
index 63e8e1602145..c335d425ef2a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org/
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 app-text/hunspell
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cdf357c2ca68a5d137fd92292cae8479
diff --git a/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.60
index 858cdbcbca3f..a80d720e1cde 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdeclarative:4 dev-libs/qjson
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=91ff3f1de458bc4adba5acee3690a7eb
diff --git a/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.65
index f0a24b8dca54..7790d1dec367 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdeclarative:4 dev-libs/qjson
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4e4c652c2f3f966ed71df9dab2e4038d
diff --git a/metadata/md5-cache/app-leechcraft/lc-sb2-9999 b/metadata/md5-cache/app-leechcraft/lc-sb2-9999
index 5d9e2f8ed178..a6132d366c4e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sb2-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-sb2-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 dev-libs/qjson
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e0dbef5e2a7524e45bbd33d8f186dec9
diff --git a/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.60
index 20872f0c0324..486f864059f1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4965542df05521b01c3660898163f1e0
diff --git a/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.65
index 7ae2e3645cec..ff01edce6857 100644
--- a/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8f854cdbe1fc61cc58ae0fb8f3be68cb
diff --git a/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999 b/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
index 0730f55aee54..c91ff0775198 100644
--- a/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c12bd2cacf6d033640f5e8bc5ef3a206
diff --git a/metadata/md5-cache/app-leechcraft/lc-secman-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-secman-0.6.60
index 96eeb315e272..4e94b4c692fe 100644
--- a/metadata/md5-cache/app-leechcraft/lc-secman-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-secman-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=655807d73d926372d9d3518ce2ef4d1b
diff --git a/metadata/md5-cache/app-leechcraft/lc-secman-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-secman-0.6.65
index 13bd222bc37e..7ed43005b367 100644
--- a/metadata/md5-cache/app-leechcraft/lc-secman-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-secman-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ad0d71d2963118d4b670daba64454f25
diff --git a/metadata/md5-cache/app-leechcraft/lc-secman-9999 b/metadata/md5-cache/app-leechcraft/lc-secman-9999
index 48da77d2bbdf..574c7ba92cfa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-secman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-secman-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=51daed65c93d3c2fbe35f4c248386f59
diff --git a/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.60
index 64aa2a4088d1..fa6295752437 100644
--- a/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=25f1efb05925bac09d8adb9ebb68588d
diff --git a/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.65
index 1b4ab3b27402..0de0e9f75a39 100644
--- a/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=19f639e37794c521fb1e4870a62631ae
diff --git a/metadata/md5-cache/app-leechcraft/lc-seekthru-9999 b/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
index 29ff4cd35032..2762bdc1ab8a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=12d6e49744af0301bbbeefca1db04391
diff --git a/metadata/md5-cache/app-leechcraft/lc-summary-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-summary-0.6.60
index 10ee1f16b6ed..c03c11ece92f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-summary-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-summary-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5ea97ce03dcd938a8a1dfe26e3601140
diff --git a/metadata/md5-cache/app-leechcraft/lc-summary-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-summary-0.6.65
index ce5b909d1d00..8e59f4331609 100644
--- a/metadata/md5-cache/app-leechcraft/lc-summary-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-summary-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1f044d2039612e426d68d1c2493c1320
diff --git a/metadata/md5-cache/app-leechcraft/lc-summary-9999 b/metadata/md5-cache/app-leechcraft/lc-summary-9999
index 5e0d440f25bf..4b47cd9f159b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-summary-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-summary-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cbae4616b17d838827158cd19532464f
diff --git a/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.60
index c4698621829c..475762f39c1e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=832e2dc185efd3cd3df6840ca056f339
diff --git a/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.65
index 8b45c50b1417..c8a3cf23675d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f284d3ad9d01e97131a47d5b064867ba
diff --git a/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999 b/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
index 7b6b75775ab2..a93d73c7cc74 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d3481fc079956548b2c03561e266a965
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.60
index 0eb099aacb08..bd282a570f6f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9b3e0267f3ad47b923802b01dfc02bff
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.65
index 32b429d0cd57..54b064b65a64 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=81d4dca126826ef9c1247a622ad40bf1
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999 b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
index 18d85f958d9c..cb95a6501f8f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=30eb7368852e4a5abd119624170797d9
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.60
index 2c3bc25d149c..cd8e5fc7a06f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5386ae145987242c92c0069704bfd2bf
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.65
index 3675b41af720..51be079dd44f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c36e3a246301a79033e438adea6a104e
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabslist-9999 b/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
index eaba324dd2d3..a9ae63addfe6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=932c6820dcc0debb7bbca0e16005a581
diff --git a/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.60
index d04da1c5115a..c1f93d6540e8 100644
--- a/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 >=dev-libs/boost-1.52.0 dev-libs/qjson dev-qt/qtwebkit:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=db0a1ede8edcd78a547a0885f82f559f
diff --git a/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.65
index 04084aec9a32..0186eb8bc5a9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 >=dev-libs/boost-1.52.0 dev-libs/qjson dev-qt/qtwebkit:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=04855b035036aa0d7b957193d2762e6b
diff --git a/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999 b/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
index 70c01fb3003e..251bc25a4da6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 >=dev-libs/boost-1.52.0 dev-libs/qjson dev-qt/qtwebkit:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d3a1ab0b10b7d19677d6a60d2a81ed1b
diff --git a/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.60
index ea50abe95557..9859f4377151 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdeclarative:4 ~virtual/leechcraft-quark-sideprovider-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8c221013a9851eba20a116a1cea0b3de
diff --git a/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.65
index 8326e4522d00..5a28e077d1e1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdeclarative:4 ~virtual/leechcraft-quark-sideprovider-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=be071c2e787105132eb325c570d4fe8c
diff --git a/metadata/md5-cache/app-leechcraft/lc-tpi-9999 b/metadata/md5-cache/app-leechcraft/lc-tpi-9999
index cf00426af2ae..bdb998c0f294 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tpi-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tpi-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8f0255cfba4f612397139a949c04fff8
diff --git a/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.60
index e438000d780b..73d8ceb90fd8 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a5fa24c0b9c20e30e2d9786e3fbeceb7
diff --git a/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.65
index 03ff85adafb1..535a4091bc9c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7d24d365292fc7cc58ec13976a02cedc
diff --git a/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999 b/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
index efb8314d5cb8..52593e284123 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d38724107c9da4eb8e058bfa68f91ad0
diff --git a/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.60
index f7ccfea3fe77..8bf6604fe819 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.60
@@ -10,5 +10,5 @@ RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdbus:4 udisks? ( sys-fs/udisks:0
 REQUIRED_USE=|| ( udisks udisks2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2fc9824ac9bd161c085f100559e6e9d5
diff --git a/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.65
index afd7f803b95e..534fe39cf388 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.65
@@ -10,5 +10,5 @@ RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdbus:4 udisks? ( sys-fs/udisks:0
 REQUIRED_USE=|| ( udisks udisks2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a2930b169bdef8acd819e7368ef586e2
diff --git a/metadata/md5-cache/app-leechcraft/lc-vrooby-9999 b/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
index 798f24f7d2f2..b870f3bacfa4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4 udisks? ( sys-fs/udisks:0 ) udisks2? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( udisks udisks2 )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=588309da715002e11036a0227c2ba908
diff --git a/metadata/md5-cache/app-leechcraft/lc-woodpecker-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-woodpecker-0.6.60
index a984f097a49e..fc7e610c6325 100644
--- a/metadata/md5-cache/app-leechcraft/lc-woodpecker-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-woodpecker-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-libs/qjson dev-libs/kqoauth
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d116b2a6e16aa96793b25391d715a06a
diff --git a/metadata/md5-cache/app-leechcraft/lc-woodpecker-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-woodpecker-0.6.65
index 26bf5aad186d..853db32039fa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-woodpecker-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-woodpecker-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-libs/qjson dev-libs/kqoauth
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0e1d14405228ba92f6b0e3c037c87fb3
diff --git a/metadata/md5-cache/app-leechcraft/lc-woodpecker-9999 b/metadata/md5-cache/app-leechcraft/lc-woodpecker-9999
index ebe049388d1b..40712154d957 100644
--- a/metadata/md5-cache/app-leechcraft/lc-woodpecker-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-woodpecker-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/qjson dev-libs/kqoauth
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b1d83377476e40063d630217a9d60a49
diff --git a/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.60
index 9ce4239d9ab5..0ef60311e8b7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8addc3b6a5f75f97c216b1f36ee543f9
diff --git a/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.65
index 8ed485221558..084bff3039e6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1feca5a36b1d775757b4a9eb103ffcf7
diff --git a/metadata/md5-cache/app-leechcraft/lc-xproxy-9999 b/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
index 911d1c515640..9b3a9d043669 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4fa622cb190796b3edb02b36a89e1b83
diff --git a/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.60
index 9b8f08b9bcc7..32fb8d5ba767 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.60
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.60 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.60.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4ac21cad7e03c5f9cf1b570d4b856c34
diff --git a/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.65
index 2eec3261e269..2839769e08d7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.65
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.65 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.6.65.tar.xz http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5e1775e9dcebb1ebfe8de0aeade62b64
diff --git a/metadata/md5-cache/app-leechcraft/lc-xtazy-9999 b/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
index 8339030c2b9f..9a16b928dcde 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	691c0841f56d6c7d056f40ace4e0f938	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	leechcraft	e0ec4b74ef98adeb1a9696617a379c7f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=046a1864aeecd9ffe8426d627d204cb5
diff --git a/metadata/md5-cache/app-misc/byobu-5.80 b/metadata/md5-cache/app-misc/byobu-5.80
new file mode 100644
index 000000000000..2fdb14bf1dd0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/byobu-5.80
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
+EAPI=5
+HOMEPAGE=http://byobu.co
+IUSE=screen python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/newt[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://launchpad.net/byobu/trunk/5.80/+download/byobu_5.80.orig.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ada768f67645b55a15a62837c5e61c16
diff --git a/metadata/md5-cache/app-misc/tracker-0.16.4 b/metadata/md5-cache/app-misc/tracker-0.16.4
index e9c2d7476d09..af7faf675404 100644
--- a/metadata/md5-cache/app-misc/tracker-0.16.4
+++ b/metadata/md5-cache/app-misc/tracker-0.16.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.35.1:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.0.2:= ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) libsecret? ( >=app-crypt/libsecret-0.5 ) mp3? ( >=media-libs/taglib-1.6 gtk? ( x11-libs/gdk-pixbuf:2 ) ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.35.1:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.0.2:= ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) libsecret? ( >=app-crypt/libsecret-0.5 ) mp3? ( >=media-libs/taglib-1.6 gtk? ( x11-libs/gdk-pixbuf:2 ) ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/tracker/
@@ -11,5 +11,5 @@ RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.35.1:2 >=
 REQUIRED_USE=^^ ( gstreamer xine ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/16
 SRC_URI=mirror://gnome/sources/tracker/0.16/tracker-0.16.4.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=935fbe613377e6dc7a12d66ea02d5072
diff --git a/metadata/md5-cache/app-misc/tracker-1.0.0 b/metadata/md5-cache/app-misc/tracker-1.0.0
index 77b0195ae02f..d1710649ad2f 100644
--- a/metadata/md5-cache/app-misc/tracker-1.0.0
+++ b/metadata/md5-cache/app-misc/tracker-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/tracker/
@@ -11,5 +11,5 @@ RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=de
 REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/100
 SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.0.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=da1bbf1ac5bdfd6f30f6a8874d178054
diff --git a/metadata/md5-cache/app-office/dia-0.97.3_pre20140417 b/metadata/md5-cache/app-office/dia-0.97.3_pre20140417
index 8c7f20cf23c5..ee07a2c8ae5f 100644
--- a/metadata/md5-cache/app-office/dia-0.97.3_pre20140417
+++ b/metadata/md5-cache/app-office/dia-0.97.3_pre20140417
@@ -4,10 +4,10 @@ DESCRIPTION=Diagram/flowchart creation program
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Dia
 IUSE=cairo doc python debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets ) python? ( >=dev-python/pygtk-2 python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/gnome/dia-0.97.3_pre20140417.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d3a7aaef798b6d4d98408603254bc89c
+_md5_=8b6d3557bc139b1879cbdd28668951e6
diff --git a/metadata/md5-cache/app-office/gnucash-2.6.3 b/metadata/md5-cache/app-office/gnucash-2.6.3
index 401e1c6fb935..9ddcdc53a017 100644
--- a/metadata/md5-cache/app-office/gnucash-2.6.3
+++ b/metadata/md5-cache/app-office/gnucash-2.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=A personal finance manager
 EAPI=5
 HOMEPAGE=http://www.gnucash.org/
 IUSE=chipcard debug +doc hbci mysql ofx postgres python quotes sqlite python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=doc? ( >=app-doc/gnucash-docs-2.2.0 )
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 dev-libs/libxslt >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 gnome-base/libgnomecanvas gnome-base/libgnome-keyring >=net-libs/webkit-gtk-1.2:2 >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.24:2 >=x11-libs/goffice-0.7.0:0.8[gnome] x11-libs/pango ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnucash/gnucash-2.6.3.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=49242d64046b4c405c6d4b35371b9d80
+_md5_=c040c77155cedfb73c98576a1dab67a3
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.14 b/metadata/md5-cache/app-office/gnumeric-1.12.14
index eaddb292a35d..2a34bb5c8e35 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.14
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.14
@@ -4,7 +4,7 @@ DESCRIPTION=The GNOME Spreadsheet
 EAPI=5
 HOMEPAGE=http://www.gnumeric.org/
 IUSE=+introspection libgda perl python python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.28:2 >=gnome-extra/libgsf-1.14.24:= >=x11-libs/goffice-0.10.14:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.2:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) libgda? ( gnome-extra/libgda:5[gtk] )
 REQUIRED_USE=python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.14.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e4b64bc9c532256e3bbdbad692e9865f
+_md5_=0e9ee9857296597be9e0f37004729196
diff --git a/metadata/md5-cache/app-office/grisbi-1.0.0 b/metadata/md5-cache/app-office/grisbi-1.0.0
index de2615376f27..00f284a2e12b 100644
--- a/metadata/md5-cache/app-office/grisbi-1.0.0
+++ b/metadata/md5-cache/app-office/grisbi-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Grisbi is a personal accounting application for Linux
 EAPI=4
 HOMEPAGE=http://www.grisbi.org
 IUSE=nls ofx ssl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=dev-libs/glib-2.18.0:2 >=x11-libs/gtk+-2.12.0:2 x11-misc/xdg-utils ssl? ( >=dev-libs/openssl-0.9.5 ) ofx? ( >=dev-libs/libofx-0.7.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/grisbi-1.0.0.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1fe04aca6be3cede8b4df8f6eaea31c5
+_md5_=894dba8b85bd54c88dc593d5a6b70590
diff --git a/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1 b/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
index 154411e69a1d..314ee4bd5d6a 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install prepare test
-DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] test? ( sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-lang/perl sys-apps/diffutils ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) 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] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-lang/perl sys-apps/diffutils ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Collection of developer scripts for Gentoo
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-lang/perl sys-apps/diffutils
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) 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] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-lang/perl sys-apps/diffutils
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://gentoo/gentoolkit-dev-0.2.8.3.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b8d6b6c1cd3d72cfbf089a86898d2821
+_md5_=14b6132641729640574bc7105f7637c3
diff --git a/metadata/md5-cache/app-portage/layman-2.0.0-r3 b/metadata/md5-cache/app-portage/layman-2.0.0-r3
index 52ca12719e1d..45a3874badb4 100644
--- a/metadata/md5-cache/app-portage/layman-2.0.0-r3
+++ b/metadata/md5-cache/app-portage/layman-2.0.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to manage Gentoo overlays
 EAPI=5
 HOMEPAGE=http://layman.sourceforge.net/
 IUSE=bazaar cvs darcs +git mercurial subversion test python_targets_python2_6 python_targets_python2_7 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy(-)] sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml(+)] ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	prefix	21058c21ca48453d771df15500873ede	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=122f06cf56aa7168279efd4271e973ad
+_md5_=2cb6bd5c9f605e11645d540740682edf
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1
index 8230174626d4..a96ba94d4a21 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) 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] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RDEPEND=dev-util/dialog net-analyzer/netselect python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) 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] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dolsen/distfiles/mirrorselect-2.2.0.1.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	prefix	21058c21ca48453d771df15500873ede	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e730a0adf054c63f6a4866b3ccc9978c
+_md5_=43ca783e6a88cca6c5c461ebdde937c7
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index fd7bc5ca74fa..dd209db5d704 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-vcs/git
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) 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] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-vcs/git
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999 python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999 python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) 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] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	prefix	21058c21ca48453d771df15500873ede	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=af42eb53f7d4336714c43d192a432720
+_md5_=84e8c828576bea041cdcfb3423da8840
diff --git a/metadata/md5-cache/app-text/calibre-1.34 b/metadata/md5-cache/app-text/calibre-1.34
deleted file mode 100644
index d499f0e0dca0..000000000000
--- a/metadata/md5-cache/app-text/calibre-1.34
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/lxml-3.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.6[X,svg,webkit] dev-qt/qtdbus:4= dev-qt/qtsvg:4= media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.5:= virtual/libusb:1= virtual/python-imaging >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5
-DESCRIPTION=Ebook management application
-EAPI=5
-HOMEPAGE=http://calibre-ebook.com/
-IUSE=+udisks
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2 unRAR
-RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/lxml-3.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.6[X,svg,webkit] dev-qt/qtdbus:4= dev-qt/qtsvg:4= media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.5:= virtual/libusb:1= virtual/python-imaging >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/1.34.0/calibre-1.34.0.tar.xz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=55677ecb2b52f97bdcbfe709805ea13a
diff --git a/metadata/md5-cache/app-text/calibre-1.35 b/metadata/md5-cache/app-text/calibre-1.35
new file mode 100644
index 000000000000..66657b07bcc0
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-1.35
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt4-4.9.6[X,svg,webkit,python_targets_python2_7(-)] dev-qt/qtdbus:4= dev-qt/qtsvg:4= media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.5:= virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5
+DESCRIPTION=Ebook management application
+EAPI=5
+HOMEPAGE=http://calibre-ebook.com/
+IUSE=+udisks
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2 unRAR
+RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt4-4.9.6[X,svg,webkit,python_targets_python2_7(-)] dev-qt/qtdbus:4= dev-qt/qtsvg:4= media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.5:= virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+SLOT=0
+SRC_URI=http://sourceforge.net/projects/calibre/files/1.35.0/calibre-1.35.0.tar.xz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=0891b8f84eb141c4f07fad5327f447b6
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.4 b/metadata/md5-cache/app-text/gtkspell-3.0.4
index 1ab3b6eed15d..48431851a9c6 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.4
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 ) >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 ) >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Spell checking widget for GTK
 EAPI=5
 HOMEPAGE=http://gtkspell.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=3/0
 SRC_URI=mirror://sourceforge/project/gtkspell/3.0.4/gtkspell3-3.0.4.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=21397a72a37222c9c0ed17ed4b53b461
diff --git a/metadata/md5-cache/app-text/mate-doc-utils-1.6.2 b/metadata/md5-cache/app-text/mate-doc-utils-1.6.2
index d0f0afa1e058..ce5de0698390 100644
--- a/metadata/md5-cache/app-text/mate-doc-utils-1.6.2
+++ b/metadata/md5-cache/app-text/mate-doc-utils-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Documentation utilities for MATE
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 LGPL-2
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-text/rarian:0 >=dev-libs/libxml2-2.6.12:2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-libs/libxslt-1.1.8:0 virtual/libintl:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-doc-utils-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f276df224a0e2feddc00b06d8491abee
+_md5_=675484b3f9a5f65bb97252d4b17e1b1b
diff --git a/metadata/md5-cache/app-text/mate-document-viewer-1.6.2-r1 b/metadata/md5-cache/app-text/mate-document-viewer-1.6.2-r1
index 936fd59b2b59..c5de7beef023 100644
--- a/metadata/md5-cache/app-text/mate-document-viewer-1.6.2-r1
+++ b/metadata/md5-cache/app-text/mate-document-viewer-1.6.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Atril document viewer for MATE
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=caja dbus debug djvu dvi +introspection gnome-keyring +ps t1lib tiff xps debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.14:0=[cairo] app-text/rarian:0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.6:0 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1:0 >=x11-libs/cairo-1.9.10:0 >=x11-themes/mate-icon-theme-1.6:0 caja? ( >=mate-base/mate-file-manager-1.6:0[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:0 ) ps? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.0.1:0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-document-viewer-1.6.2.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9776033c5448cac173b1ab184a18939c
+_md5_=3b79cf753ac69ee707f0e9ce55cf7251
diff --git a/metadata/md5-cache/app-text/ocrad-0.22 b/metadata/md5-cache/app-text/ocrad-0.22
index 500bf1902749..19c98850122b 100644
--- a/metadata/md5-cache/app-text/ocrad-0.22
+++ b/metadata/md5-cache/app-text/ocrad-0.22
@@ -3,9 +3,9 @@ DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
 DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/ocrad/ocrad.html
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.22.tar.lz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=392f6843b943504e8c2e763c12aa5b72
+_md5_=6266328edcb56bda31db2b9aa0294150
diff --git a/metadata/md5-cache/app-vim/bash-support-4.1 b/metadata/md5-cache/app-vim/bash-support-4.1
index 5b4ba9548124..6d0a06b17bbd 100644
--- a/metadata/md5-cache/app-vim/bash-support-4.1
+++ b/metadata/md5-cache/app-vim/bash-support-4.1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Bash-IDE - Write and run bash scripts using menus and hotkeys
 EAPI=5
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=365
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bash-support-4.1.tar.bz2 http://dev.gentoo.org/~radhermit/vim/bash-support-4.1.tar.bz2
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
-_md5_=6d589c5464a346d68edb30536322d10c
+_md5_=106e706625d96743ecdb3794d7180450
diff --git a/metadata/md5-cache/dev-cpp/rudiments-0.31 b/metadata/md5-cache/dev-cpp/rudiments-0.31
deleted file mode 100644
index b264a6f6948d..000000000000
--- a/metadata/md5-cache/dev-cpp/rudiments-0.31
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl )
-DESCRIPTION=C++ class library for daemons, clients and servers
-HOMEPAGE=http://rudiments.sourceforge.net/
-IUSE=debug pcre ssl
-KEYWORDS=~x86 ~amd64 ~ppc
-LICENSE=LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/rudiments/rudiments-0.31.tar.gz
-_md5_=12fa1d8430821e3a4520bb8717e28a47
diff --git a/metadata/md5-cache/dev-cpp/rudiments-0.32 b/metadata/md5-cache/dev-cpp/rudiments-0.32
deleted file mode 100644
index 66514efc7b6d..000000000000
--- a/metadata/md5-cache/dev-cpp/rudiments-0.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl )
-DESCRIPTION=C++ class library for daemons, clients and servers
-HOMEPAGE=http://rudiments.sourceforge.net/
-IUSE=debug pcre ssl
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/rudiments/rudiments-0.32.tar.gz
-_md5_=069bedb116ae52ff85119fe0722d7101
diff --git a/metadata/md5-cache/dev-cpp/rudiments-0.46 b/metadata/md5-cache/dev-cpp/rudiments-0.46
new file mode 100644
index 000000000000..06399cc7b059
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/rudiments-0.46
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=C++ class library for daemons, clients and servers
+EAPI=5
+HOMEPAGE=http://rudiments.sourceforge.net/
+IUSE=debug pcre ssl static-libs
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/rudiments/rudiments-0.46.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=dcf914d58abd8afc983220bd26872ae2
diff --git a/metadata/md5-cache/dev-db/barman-1.3.0 b/metadata/md5-cache/dev-db/barman-1.3.0
new file mode 100644
index 000000000000..c8916c7a6947
--- /dev/null
+++ b/metadata/md5-cache/dev-db/barman-1.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Administration tool for disaster recovery of PostgreSQL servers
+EAPI=5
+HOMEPAGE=http://www.pgbarman.org
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/argh[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/psycopg-2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/rsync dev-db/postgresql-server python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://downloads.sourceforge.net/project/pgbarman/1.3.0/barman-1.3.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=1528a6eea44c135890c9817349766744
diff --git a/metadata/md5-cache/dev-db/redis-2.8.9 b/metadata/md5-cache/dev-db/redis-2.8.9
new file mode 100644
index 000000000000..ee1231b485be
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-2.8.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=A persistent caching system, key-value and data structures database.
+EAPI=5
+HOMEPAGE=http://redis.io/
+IUSE=+jemalloc tcmalloc test
+KEYWORDS=~amd64 ~x86 ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
+REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
+SLOT=0
+SRC_URI=http://download.redis.io/releases/redis-2.8.9.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d9bc0462856f4d1c3648c7afb807333b
diff --git a/metadata/md5-cache/dev-embedded/libftd2xx-1.1.12 b/metadata/md5-cache/dev-embedded/libftd2xx-1.1.12
new file mode 100644
index 000000000000..448f2e764b4f
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/libftd2xx-1.1.12
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Library that allows a direct access to a USB device
+EAPI=5
+HOMEPAGE=http://www.ftdichip.com/Drivers/D2XX.htm
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=FTDI LGPL-2.1+
+SLOT=0
+SRC_URI=http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx1.1.12.tar.gz
+_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=5b121c5d54653051729d8793e0712a10
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.8.0_rc2 b/metadata/md5-cache/dev-embedded/openocd-0.8.0_rc2
index 4a0274a7264a..c6efc86cc201 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.8.0_rc2
+++ b/metadata/md5-cache/dev-embedded/openocd-0.8.0_rc2
@@ -1,15 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )
+DEPEND=>=dev-lang/jimtcl-0.73 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=5
 HOMEPAGE=http://openocd.sourceforge.net
-IUSE=blaster dummy ftdi minidriver parport presto segger +usb verbose-io
+IUSE=cmsis-dap dummy ftdi parport +usb verbose-io
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )
-REQUIRED_USE=blaster? ( ftdi ) presto? ( ftdi )
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/jimtcl-0.73 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.8.0-rc2/openocd-0.8.0-rc2.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f9740d3db2011c8df6c96e11b49834dc
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=a8046f9560e203bde6badbe7f11a5f28
diff --git a/metadata/md5-cache/dev-embedded/openocd-9999 b/metadata/md5-cache/dev-embedded/openocd-9999
index 0e124c4b0d48..3b7a50b6c3f6 100644
--- a/metadata/md5-cache/dev-embedded/openocd-9999
+++ b/metadata/md5-cache/dev-embedded/openocd-9999
@@ -1,13 +1,12 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-lang/jimtcl-0.73 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi ) virtual/pkgconfig virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=5
 HOMEPAGE=http://openocd.sourceforge.net
-IUSE=blaster dummy ftdi minidriver parport presto segger +usb verbose-io
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )
-REQUIRED_USE=blaster? ( ftdi ) presto? ( ftdi )
+IUSE=cmsis-dap dummy ftdi parport +usb verbose-io
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/jimtcl-0.73 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=38e37196ccf9f568eab8d18bf7329984
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=32baf634fa4701285f6250e1d726625a
diff --git a/metadata/md5-cache/dev-embedded/srecord-1.63 b/metadata/md5-cache/dev-embedded/srecord-1.63
new file mode 100644
index 000000000000..26d46866a3ea
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/srecord-1.63
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0 dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A collection of powerful tools for manipulating EPROM load files
+EAPI=5
+HOMEPAGE=http://srecord.sourceforge.net/
+IUSE=static-libs test
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0
+SLOT=0
+SRC_URI=mirror://sourceforge/srecord/srecord-1.63.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=0f14729258d1ce6f02e17969282d9d58
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2014.01 b/metadata/md5-cache/dev-embedded/u-boot-tools-2014.01
index dba14aef0a98..76a48f01a292 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2014.01
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2014.01
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=utilities for working with Das U-Boot
 EAPI=5
 HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
-KEYWORDS=~amd64 arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2014.01.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=313b8713567907de879d18f21f732d8a
+_md5_=b72c1778a5b1d5604e6ce00e920f2455
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
new file mode 100644
index 000000000000..ddf90bf97023
--- /dev/null
+++ b/metadata/md5-cache/dev-java/headius-options-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A small library for managing sets of JVM properties
+EAPI=5
+HOMEPAGE=https://github.com/headius/options
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/headius/options/archive/options-1.1.tar.gz -> headius-options-1.1.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=e015531c81edf7b958b4856be149863c
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.55 b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.55
new file mode 100644
index 000000000000..aaf5247b5945
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.55
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
+EAPI=5
+HOMEPAGE=http://download.oracle.com/javase/7/docs/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=oracle-java-documentation-7
+RESTRICT=fetch
+SLOT=1.7
+SRC_URI=jdk-7u55-apidocs.zip
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=7651441f6b61f58fcbb26657e65ff48d
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.11 b/metadata/md5-cache/dev-java/jcodings-1.0.11
new file mode 100644
index 000000000000..ae6c9b2e94eb
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Byte-based encoding support library for Java
+EAPI=5
+HOMEPAGE=http://jruby.codehaus.org/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=1
+SRC_URI=https://github.com/jruby/jcodings/archive/jcodings-1.0.11.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=6126a8e10b1f78a0243b1f00b6615100
diff --git a/metadata/md5-cache/dev-java/joni-2.1.0 b/metadata/md5-cache/dev-java/joni-2.1.0
new file mode 100644
index 000000000000..4c5eec5642ed
--- /dev/null
+++ b/metadata/md5-cache/dev-java/joni-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=dev-java/asm:3 dev-java/jcodings:1 >=virtual/jdk-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Java port of the Oniguruma regular expression engine
+EAPI=5
+HOMEPAGE=http://jruby.codehaus.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-java/asm:3 dev-java/jcodings:1 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=2.1
+SRC_URI=https://github.com/jruby/joni/archive/joni-2.1.0.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=7536f1ec3aa724b74f1d4aa61c15a6b4
diff --git a/metadata/md5-cache/dev-java/jruby-1.6.5.1 b/metadata/md5-cache/dev-java/jruby-1.6.5.1
index 3b6840e01e98..d6b88a819212 100644
--- a/metadata/md5-cache/dev-java/jruby-1.6.5.1
+++ b/metadata/md5-cache/dev-java/jruby-1.6.5.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-src-1.6.5.1.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3de5248f4592b660a9f24a9e0bd6c487
+_md5_=ae3cd602d71eedcf95bbcf74c2fafac8
diff --git a/metadata/md5-cache/dev-java/jruby-1.7.12 b/metadata/md5-cache/dev-java/jruby-1.7.12
new file mode 100644
index 000000000000..0a2426192438
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jruby-1.7.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/ant-core:0 dev-java/asm:4 dev-java/bsf:2.3 >=dev-java/bytelist-1.0.8:0 dev-java/headius-options:0 dev-java/invokebinder:0 dev-java/jcodings:1 dev-java/jffi:1.2 dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-ffi:0.7 >=dev-java/jnr-netdb-1.0:0 dev-java/jnr-posix:2.4 dev-java/jnr-unixsocket:0 dev-java/joda-time:0 dev-java/joni:2.1 dev-java/nailgun:0 dev-java/osgi-core-api:0 dev-lang/ruby:1.9 >=dev-java/snakeyaml-1.9:0 dev-java/jzlib:1.1 >=virtual/jdk-1.8 test? ( dev-java/ant-junit4:0 dev-java/ant-trax:0 dev-java/commons-logging:0 dev-java/junit:4 dev-java/xalan:0 java-virtuals/jdk-with-com-sun:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Java-based Ruby interpreter implementation
+EAPI=5
+HOMEPAGE=http://jruby.codehaus.org/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=|| ( EPL-1.0 GPL-2 LGPL-2.1 )
+RDEPEND=dev-java/ant-core:0 dev-java/asm:4 dev-java/bsf:2.3 >=dev-java/bytelist-1.0.8:0 dev-java/headius-options:0 dev-java/invokebinder:0 dev-java/jcodings:1 dev-java/jffi:1.2 dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-ffi:0.7 >=dev-java/jnr-netdb-1.0:0 dev-java/jnr-posix:2.4 dev-java/jnr-unixsocket:0 dev-java/joda-time:0 dev-java/joni:2.1 dev-java/nailgun:0 dev-java/osgi-core-api:0 dev-lang/ruby:1.9 >=dev-java/snakeyaml-1.9:0 dev-java/jzlib:1.1 >=virtual/jre-1.8 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.7.12/jruby-src-1.7.12.tar.gz http://dev.gentoo.org/~tomwij/files/dist/jruby-1.7.12-mvn-ant-ant.patch
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=27f4513f9d112cc6f50ea4bfcd13b186
diff --git a/metadata/md5-cache/dev-lang/php-5.4.28 b/metadata/md5-cache/dev-lang/php-5.4.28
new file mode 100644
index 000000000000..e958159ac82b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.4.28
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3
+RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+SLOT=5.4
+SRC_URI=http://www.php.net/distributions/php-5.4.28.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	5256b4f4c1798109f39f308f9f7eaf5f	db-use	1c719875d6599536f956fafea9e1f404	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=31a50f259fe2d24dc4ee126ad4395ae5
diff --git a/metadata/md5-cache/dev-lang/php-5.5.12 b/metadata/md5-cache/dev-lang/php-5.5.12
new file mode 100644
index 000000000000..a0698fce4b00
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.5.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3
+RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+SLOT=5.5
+SRC_URI=http://www.php.net/distributions/php-5.5.12.tar.bz2
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	5256b4f4c1798109f39f308f9f7eaf5f	db-use	1c719875d6599536f956fafea9e1f404	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8e2f10d8204af66c7ec2a384e3e8ec42
diff --git a/metadata/md5-cache/dev-lang/php-5.6.0_beta2 b/metadata/md5-cache/dev-lang/php-5.6.0_beta2
new file mode 100644
index 000000000000..3b16faa1ece0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.6.0_beta2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3
+RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+SLOT=5.6
+SRC_URI=http://downloads.php.net/tyrael/php-5.6.0beta2.tar.bz2
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	5256b4f4c1798109f39f308f9f7eaf5f	db-use	1c719875d6599536f956fafea9e1f404	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8aeba73b638e1a639a669e7949e46b16
diff --git a/metadata/md5-cache/dev-libs/dee-1.0.14-r2 b/metadata/md5-cache/dev-libs/dee-1.0.14-r2
index eb6e27546099..f34550f4b7ea 100644
--- a/metadata/md5-cache/dev-libs/dee-1.0.14-r2
+++ b/metadata/md5-cache/dev-libs/dee-1.0.14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Provide objects allowing to create Model-View-Controller type programs across DBus
 EAPI=5
 HOMEPAGE=https://launchpad.net/dee/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_6
 REQUIRED_USE=introspection? ( || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) )
 SLOT=0
 SRC_URI=https://launchpad.net/dee/1.0/1.0.14/+download/dee-1.0.14.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=8af6b3ca435f554e2d3d96c40fbdda39
diff --git a/metadata/md5-cache/dev-libs/e_dbus-1.7.10 b/metadata/md5-cache/dev-libs/e_dbus-1.7.10
index 8fed19fa76ff..601a08e572e3 100644
--- a/metadata/md5-cache/dev-libs/e_dbus-1.7.10
+++ b/metadata/md5-cache/dev-libs/e_dbus-1.7.10
@@ -4,10 +4,10 @@ DESCRIPTION=Enlightenment's (Ecore) integration to DBus
 EAPI=4
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=bluetooth +connman +libnotify ofono static-libs test-binaries +udev nls doc
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.8.4 sys-apps/dbus connman? ( >=net-misc/connman-0.75 ) udev? ( sys-power/upower sys-fs/udisks:0 ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/e_dbus-1.7.10.tar.bz2
 _eclasses_=enlightenment	6aee6d669b6c495a4e151bd1bd85e57c	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d0ad642a492ccff93d88dc2566cb6388
+_md5_=c194db1d1b12f33562685307c6788720
diff --git a/metadata/md5-cache/dev-libs/efl-1.8.5 b/metadata/md5-cache/dev-libs/efl-1.8.5
index c93fe3fc51be..73fa35a89627 100644
--- a/metadata/md5-cache/dev-libs/efl-1.8.5
+++ b/metadata/md5-cache/dev-libs/efl-1.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=5
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm nls doc
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
 RDEPEND=audio? ( media-libs/libsndfile ) debug? ( dev-util/valgrind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jp2k? ( media-libs/openjpeg ) jpeg? ( virtual/jpeg ) physics? ( sci-physics/bullet ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl virtual/opengl ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff ) tslib? ( x11-libs/tslib ) wayland? ( >=dev-libs/wayland-1.3.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xcb? ( x11-libs/libxcb opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl x11-libs/xcb-util-renderutil ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl x11-libs/xcb-util-renderutil ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) dev-lang/lua sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas nls? ( sys-devel/gettext )
 REQUIRED_USE=X? ( !xcb ) pulseaudio? ( audio ) opengl? ( || ( X xcb sdl wayland ) ) gles? ( || ( X xcb wayland ) ) gles? ( !sdl ) gles? ( egl ) xcb? ( pixman ) wayland? ( egl !opengl gles ) xim? ( || ( X xcb ) )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/rel/libs/efl/efl-1.8.5.tar.bz2
 _eclasses_=enlightenment	6aee6d669b6c495a4e151bd1bd85e57c	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=bad0c38c700731a2162cd56b793fa784
+_md5_=31bbd470649e5229a9cd456b366acffd
diff --git a/metadata/md5-cache/dev-libs/folks-0.4.3 b/metadata/md5-cache/dev-libs/folks-0.4.3
index 3e3c8d0fb701..1661222b01d0 100644
--- a/metadata/md5-cache/dev-libs/folks-0.4.3
+++ b/metadata/md5-cache/dev-libs/folks-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=net-libs/telepathy-glib-0.13.1[vala] dev-libs/dbus-glib <dev-libs/libgee-0.7:0 dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) >=dev-util/intltool-0.35.0 virtual/pkgconfig >=dev-libs/gobject-introspection-0.9.12 sys-devel/gettext >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.24:2 >=net-libs/telepathy-glib-0.13.1[vala] dev-libs/dbus-glib <dev-libs/libgee-0.7:0 dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) >=dev-util/intltool-0.35.0 virtual/pkgconfig >=dev-libs/gobject-introspection-0.9.12 sys-devel/gettext >=sys-apps/sed-4
 DESCRIPTION=libfolks is a library that aggregates people from multiple sources
 EAPI=5
 HOMEPAGE=http://telepathy.freedesktop.org/wiki/Folks
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.24:2 >=net-libs/telepathy-glib-0.13.1[vala] dev-libs/dbus-glib <dev-libs/libgee-0.7:0 dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/folks/0.4/folks-0.4.3.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=24a9b4122c4a31baaea6f0d99011b0a3
diff --git a/metadata/md5-cache/dev-libs/folks-0.9.6 b/metadata/md5-cache/dev-libs/folks-0.9.6
index 45dd64b4d6bf..68795369c60c 100644
--- a/metadata/md5-cache/dev-libs/folks-0.9.6
+++ b/metadata/md5-cache/dev-libs/folks-0.9.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=|| ( dev-lang/vala:0.22[vapigen] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-0.16:= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) >=dev-libs/gobject-introspection-1.30 >=dev-util/intltool-0.50.0 sys-devel/gettext virtual/pkgconfig socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] ) test? ( sys-apps/dbus ) !<dev-lang/vala-0.22.1:0.22 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-0.16:= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) >=dev-libs/gobject-introspection-1.30 >=dev-util/intltool-0.50.0 sys-devel/gettext virtual/pkgconfig socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] ) test? ( sys-apps/dbus ) !<dev-lang/vala-0.22.1:0.22 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Library for aggregating people from multiple sources
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Folks
 IUSE=bluetooth eds socialweb +telepathy test tracker utils zeitgeist debug test
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=|| ( dev-lang/vala:0.22[vapigen] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-0.16:= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) net-im/telepathy-mission-control
+RDEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-0.16:= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) net-im/telepathy-mission-control
 REQUIRED_USE=bluetooth? ( eds )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.9/folks-0.9.6.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2985177269bac6401ad31aebc9f5956e
diff --git a/metadata/md5-cache/dev-libs/folks-0.9.6-r1 b/metadata/md5-cache/dev-libs/folks-0.9.6-r1
index b1f6bbf36e65..1c89a205f3a6 100644
--- a/metadata/md5-cache/dev-libs/folks-0.9.6-r1
+++ b/metadata/md5-cache/dev-libs/folks-0.9.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=|| ( dev-lang/vala:0.22[vapigen] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) >=dev-libs/gobject-introspection-1.30 >=dev-util/intltool-0.50.0 sys-devel/gettext virtual/pkgconfig socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] ) test? ( sys-apps/dbus ) !<dev-lang/vala-0.22.1:0.22 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) >=dev-libs/gobject-introspection-1.30 >=dev-util/intltool-0.50.0 sys-devel/gettext virtual/pkgconfig socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] ) test? ( sys-apps/dbus ) !<dev-lang/vala-0.22.1:0.22 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Library for aggregating people from multiple sources
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Folks
 IUSE=bluetooth eds socialweb +telepathy test tracker utils zeitgeist debug test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=|| ( dev-lang/vala:0.22[vapigen] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) net-im/telepathy-mission-control
+RDEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] ) >=dev-libs/glib-2.38.2:2 dev-libs/dbus-glib >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] ) socialweb? ( >=net-libs/libsocialweb-0.25.20 ) telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) net-im/telepathy-mission-control
 REQUIRED_USE=bluetooth? ( eds )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.9/folks-0.9.6.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ab8ff92dde5d2d8db7bb7c948c18306a
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.6 b/metadata/md5-cache/dev-libs/fribidi-0.19.6
new file mode 100644
index 000000000000..7f86f72407cc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=A free implementation of the unicode bidirectional algorithm
+EAPI=5
+HOMEPAGE=http://fribidi.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://fribidi.org/download/fribidi-0.19.6.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=4d59316d3bfb519b486ec35baf7071f0
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.19-r1 b/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
index 0d913c886e7a..a3916e88ea71 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] dev-lang/vala:0.10[vapigen] ) >=dev-libs/gobject-introspection-1.30.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-1.30.0 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=5
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/stable/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.19.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e7e4fe8d8a7b1118b0432fd2b65524d4
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.20 b/metadata/md5-cache/dev-libs/gmime-2.6.20
index 0d687ce57873..0c8b4ed40a17 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.20
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] dev-lang/vala:0.10[vapigen] ) >=dev-libs/gobject-introspection-1.30.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-1.30.0 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=5
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/stable/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.20.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bd2a444b91d2f837015260304d89ed15
diff --git a/metadata/md5-cache/dev-libs/gmp-5.1.3-r1 b/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
index 7cf48104e181..0cc0c53033bd 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
+++ b/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for arithmetic on arbitrary precision integers, rational num
 EAPI=4
 HOMEPAGE=http://gmplib.org/
 IUSE=doc cxx pgo static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=LGPL-3
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.1.3.tar.xz ftp://ftp.gmplib.org/pub/gmp-5.1.3/gmp-5.1.3.tar.xz doc? ( http://gmplib.org/gmp-man-5.1.3.pdf )
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=707925ba75642df6426b82f4de0add1b
+_md5_=2a02c22b24649b6f40c6b17f95a26b73
diff --git a/metadata/md5-cache/dev-libs/granite-0.1.0 b/metadata/md5-cache/dev-libs/granite-0.1.0
index a0842f326e06..355dbc5794ce 100644
--- a/metadata/md5-cache/dev-libs/granite-0.1.0
+++ b/metadata/md5-cache/dev-libs/granite-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0 x11-libs/gtk+:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0 x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A development library for elementary development
 EAPI=4
 HOMEPAGE=http://launchpad.net/granite
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://launchpad.net/granite/0.x/0.1/+download/granite-0.1.0.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=e0db87b206979d1f4818e4faa010ebf9
diff --git a/metadata/md5-cache/dev-libs/granite-0.2.1 b/metadata/md5-cache/dev-libs/granite-0.2.1
index 2511f4082141..46283f255d69 100644
--- a/metadata/md5-cache/dev-libs/granite-0.2.1
+++ b/metadata/md5-cache/dev-libs/granite-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] x11-libs/gtk+:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
 DESCRIPTION=A development library for elementary development
 EAPI=5
 HOMEPAGE=http://launchpad.net/granite
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://launchpad.net/granite/0.2/0.2.1/+download/granite-0.2.1.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ca45f5075870376423acbf2c5beab77c
diff --git a/metadata/md5-cache/dev-libs/granite-0.2.3.1 b/metadata/md5-cache/dev-libs/granite-0.2.3.1
index 31329d27ce3e..2e8864e1dc4a 100644
--- a/metadata/md5-cache/dev-libs/granite-0.2.3.1
+++ b/metadata/md5-cache/dev-libs/granite-0.2.3.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.32 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] >=x11-libs/gtk+-3.3.14:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] >=x11-libs/gtk+-3.3.14:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
 DESCRIPTION=A development library for elementary development
 EAPI=5
 HOMEPAGE=http://launchpad.net/granite
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.32 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] >=x11-libs/gtk+-3.3.14:3
 SLOT=0
 SRC_URI=http://launchpad.net/granite/0.2/0.2.3.1/+download/granite-0.2.3.1.tgz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=993efffab3247837a55d54b427142c52
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=ef38db30774b053aa9f22f9adfbaeae6
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0
index bb6d0677df7c..0c47b2daa822 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.26 >=dev-libs/libdbusmenu-0.6.2:3[gtk] >=dev-libs/libindicator-12.10.0:3 >=x11-libs/gtk+-3.2:3 introspection? ( >=dev-libs/gobject-introspection-1 ) virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) )
+DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.26 >=dev-libs/libdbusmenu-0.6.2:3[gtk] >=dev-libs/libindicator-12.10.0:3 >=x11-libs/gtk+-3.2:3 introspection? ( >=dev-libs/gobject-introspection-1 ) virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) )
 DESCRIPTION=A library to allow applications to export a menu into the Unity Menu bar
 EAPI=4
 HOMEPAGE=http://launchpad.net/libappindicator
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.26 >=dev-libs/libdbusmenu-0.6.2:3[gtk] >=dev-libs/libindicator-12.10.0:3 >=x11-libs/gtk+-3.2:3 introspection? ( >=dev-libs/gobject-introspection-1 )
 SLOT=3
 SRC_URI=http://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=6300a019373162a37e80c453cbdb5459
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.92 b/metadata/md5-cache/dev-libs/libcdio-0.92
index 536c24deb51a..cf9f4faad6fc 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.92
+++ b/metadata/md5-cache/dev-libs/libcdio-0.92
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7 cddb? ( >=media-libs/libcddb-1.3.2 ) ) virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/15
 SRC_URI=mirror://gnu/libcdio/libcdio-0.92.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8bd751728829c20e47b0e2b4c7e08d87
+_md5_=409b71ffb61cc6171fb8f91725834185
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2 b/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
index 7ce116873a13..8b3a6b871ad0 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.32 >=dev-libs/dbus-glib-0.100 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) )
+DEPEND=>=dev-libs/glib-2.32 >=dev-libs/dbus-glib-0.100 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) )
 DESCRIPTION=Library to pass menu structure across DBus
 EAPI=4
 HOMEPAGE=http://launchpad.net/dbusmenu
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/glib-2.32 >=dev-libs/dbus-glib-0.100 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200
 SLOT=3
 SRC_URI=http://launchpad.net/dbusmenu/0.6/0.6.2/+download/libdbusmenu-0.6.2.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=9b3939e3f7af6525176b76bdd387a150
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2 b/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2
index 3b6c5dd277ee..24c934f205fe 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/json-glib-0.13.4 >=dev-libs/glib-2.32 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) )
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/json-glib-0.13.4 >=dev-libs/glib-2.32 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) )
 DESCRIPTION=Library to pass menu structure across DBus
 EAPI=5
 HOMEPAGE=http://launchpad.net/dbusmenu
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/json-glib-0.13.4 >=dev-libs/glib-2.32 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200
 SLOT=3
 SRC_URI=http://launchpad.net/dbusmenu/12.10/12.10.2/+download/libdbusmenu-12.10.2.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=2196d70fd18f4e66a674ebbc505e20c5
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.14.0 b/metadata/md5-cache/dev-libs/libgdata-0.14.0
index 156262d82565..d552f6782ae8 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.14.0
+++ b/metadata/md5-cache/dev-libs/libgdata-0.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 >=gnome-base/gnome-common-3.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 >=gnome-base/gnome-common-3.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
 EAPI=5
 HOMEPAGE=http://live.gnome.org/libgdata
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 SLOT=0/13
 SRC_URI=mirror://gnome/sources/libgdata/0.14/libgdata-0.14.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=808907180b8ca0ece540e4425f1ab9c5
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.14.1 b/metadata/md5-cache/dev-libs/libgdata-0.14.1
index b64818059321..98856e92f404 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.14.1
+++ b/metadata/md5-cache/dev-libs/libgdata-0.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 >=gnome-base/gnome-common-3.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 >=gnome-base/gnome-common-3.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
 EAPI=5
 HOMEPAGE=http://live.gnome.org/libgdata
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 SLOT=0/13
 SRC_URI=mirror://gnome/sources/libgdata/0.14/libgdata-0.14.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=68d2da84eee137b7eae2b711b3f2110c
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.1.6 b/metadata/md5-cache/dev-libs/libgusb-0.1.6
index 12905d1df317..bb5fe5be60fc 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.1.6
+++ b/metadata/md5-cache/dev-libs/libgusb-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.28:2 virtual/libusb:1 virtual/udev[gudev] introspection? ( >=dev-libs/gobject-introspection-1.29 ) app-arch/xz-utils dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) )
+DEPEND=>=dev-libs/glib-2.28:2 virtual/libusb:1 virtual/udev[gudev] introspection? ( >=dev-libs/gobject-introspection-1.29 ) app-arch/xz-utils dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) )
 DESCRIPTION=GObject wrapper for libusb
 EAPI=5
 HOMEPAGE=https://gitorious.org/gusb/
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~hughsient/releases/libgusb-0.1.6.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=d0b0b8489d215db68997e10a9a97c222
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.10.2 b/metadata/md5-cache/dev-libs/libgweather-3.10.2
index 41e12c2dbf91..4cd89176b500 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.10.2
+++ b/metadata/md5-cache/dev-libs/libgweather-3.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Library to access weather information from online services
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/LibGWeather
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-6
 SRC_URI=mirror://gnome/sources/libgweather/3.10/libgweather-3.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c452862c4278dd1807e4f913f9b1ee97
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.12.1 b/metadata/md5-cache/dev-libs/libgweather-3.12.1
index d085f1a1855e..2e1b8ccf2962 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.12.1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Library to access weather information from online services
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/LibGWeather
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-6
 SRC_URI=mirror://gnome/sources/libgweather/3.12/libgweather-3.12.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4a2dab74c3f924d92f75511909506d5f
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1 b/metadata/md5-cache/dev-libs/libindicate-12.10.1
index 7bbeaa90fabc..fd5ee0e7e0e1 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) app-text/gnome-doc-utils virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) app-text/gnome-doc-utils virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library to raise flags on DBus for other components of the desktop to pick up and visualize
 EAPI=5
 HOMEPAGE=http://launchpad.net/libindicate
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0
 RESTRICT=test
 SLOT=3
 SRC_URI=http://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=eefc70a5d7747e2e78de822b55734c5f
diff --git a/metadata/md5-cache/dev-libs/liblogging-1.0.4 b/metadata/md5-cache/dev-libs/liblogging-1.0.4
new file mode 100644
index 000000000000..6d590a2cf6e1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblogging-1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=systemd? ( sys-apps/systemd ) virtual/pkgconfig
+DESCRIPTION=Liblogging is an easy to use, portable, open source library for system logging.
+EAPI=5
+HOMEPAGE=http://www.liblogging.org
+IUSE=rfc3195 static-libs +stdlog systemd
+KEYWORDS=~amd64 ~arm ~hppa ~x86
+LICENSE=BSD-2
+RDEPEND=systemd? ( sys-apps/systemd )
+SLOT=0/0
+SRC_URI=http://download.rsyslog.com/liblogging/liblogging-1.0.4.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=c4c28d3365741328d73d58e17b8fbfd5
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.6.2 b/metadata/md5-cache/dev-libs/libmateweather-1.6.2
index e3beac16d18b..5ecb4c1aa20a 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.6.2
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=MATE library to access weather information from online services
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=python debug python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.13:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.42.1:2.4 >=net-libs/libsoup-gnome-2.25.1:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.11:2 virtual/libintl:0 python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygobject-2:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/libmateweather-1.6.2.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=149b6813b0fa717cda71b033f4747742
+_md5_=e8a36a658636eba7ddb8f9c7024b9cef
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.24 b/metadata/md5-cache/dev-libs/libnl-3.2.24
index fa44c32ce969..898714e7f1b7 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.2.24
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.24
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python? ( dev-lang/swig ) sys-devel/flex sys-devel/bison userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python? ( dev-lang/swig ) sys-devel/flex sys-devel/bison userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=5
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/
-IUSE=static-libs python utils python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=static-libs python utils python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
-RDEPEND=python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) )
+RDEPEND=python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=3
 SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-3.2.24.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0d1fa7494c6c4e8e4512874ead3c4325
+_md5_=88099d76ad3811a6457707db4cf19dd4
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.9999 b/metadata/md5-cache/dev-libs/libnl-3.2.9999
index 7cd68b5164be..3c1dd5a4ac5a 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.2.9999
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python? ( dev-lang/swig ) sys-devel/flex sys-devel/bison !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 ) >=dev-vcs/git-1.8.2.1
+DEPEND=python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python? ( dev-lang/swig ) sys-devel/flex sys-devel/bison !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=5
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/
-IUSE=static-libs python utils python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=static-libs python utils python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
-RDEPEND=python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) )
+RDEPEND=python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=3
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6d1828566ca79a1eb78db75608c4bb08
+_md5_=d8a807abb2e77cd90b6cb7e13dcb0bf6
diff --git a/metadata/md5-cache/dev-libs/librelp-1.2.7 b/metadata/md5-cache/dev-libs/librelp-1.2.7
new file mode 100644
index 000000000000..5d217f34df4c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/librelp-1.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ssl? ( >=net-libs/gnutls-2.12.23-r1 ) virtual/pkgconfig
+DESCRIPTION=An easy to use library for the RELP protocol.
+EAPI=5
+HOMEPAGE=http://www.librelp.com/
+IUSE=debug doc +ssl static-libs
+KEYWORDS=~amd64 ~arm ~hppa ~sparc ~x86
+LICENSE=GPL-3 doc? ( FDL-1.3 )
+RDEPEND=ssl? ( >=net-libs/gnutls-2.12.23-r1 )
+SLOT=0
+SRC_URI=http://download.rsyslog.com/librelp/librelp-1.2.7.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=b55a2f7b21054980aa27446515f833d9
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.2 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.2
index 74251f9da35d..9f079d362e79 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.2
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.2
@@ -4,10 +4,10 @@ DESCRIPTION=Playlist parsing library
 EAPI=5
 HOMEPAGE=http://developer.gnome.org/totem-pl-parser/stable/
 IUSE=archive crypt +introspection +quvi test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/gmime:2.6 >=net-libs/libsoup-2.43:2.4 archive? ( >=app-arch/libarchive-3 ) crypt? ( dev-libs/libgcrypt:0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) quvi? ( >=media-libs/libquvi-0.9.1:0= )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f53cfa95592ed44f54d866aef5348bed
+_md5_=5efa51d345030ad1a4ac6e561361fe0b
diff --git a/metadata/md5-cache/dev-perl/Roman-1.230.0 b/metadata/md5-cache/dev-perl/Roman-1.230.0
index e4408ea0e111..ad8b638bc1f3 100644
--- a/metadata/md5-cache/dev-perl/Roman-1.230.0
+++ b/metadata/md5-cache/dev-perl/Roman-1.230.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl module for conversion between Roman and Arabic numerals
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Roman/
 IUSE=test
-KEYWORDS=amd64 ~arm ~mips x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~mips ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Roman-1.23.zip
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=773a05d324ea776bde81193ba92b40fb
+_md5_=2aa068ff6559520e47ec7e0c73feaf33
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.0 b/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.0
deleted file mode 100644
index 1f826c84f2dc..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=Render text using FIGlet fonts.
-HOMEPAGE=http://pear.php.net/Text_Figlet
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-2.02 as-is
-RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Text_Figlet-1.0.0.tgz
-_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	php-pear-r1	c984187b1bfa4f9c980f68a3682211d2	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=098c676a5c8368dc1563205919fcde72
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.1 b/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.1
deleted file mode 100644
index e6144f275e7b..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=Render text using FIGlet fonts.
-HOMEPAGE=http://pear.php.net/Text_Figlet
-KEYWORDS=amd64 x86
-LICENSE=PHP-2.02 as-is
-RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Text_Figlet-1.0.1.tgz
-_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	php-pear-r1	c984187b1bfa4f9c980f68a3682211d2	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8141670215e3130de4a373dc269d72ca
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2 b/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2
index 790b49a0ac88..5e58af38d9ff 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install setup
 DEPEND=dev-lang/php >=dev-php/pear-1.8.1
 DESCRIPTION=Render text using FIGlet fonts.
 HOMEPAGE=http://pear.php.net/Text_Figlet
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-2.02 GPL-2+ OFL-1.1
 RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http://pear.php.net/get/Text_Figlet-1.0.2.tgz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	php-pear-r1	c984187b1bfa4f9c980f68a3682211d2	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e09b849374fbaa68fb4efb50df8ba1fb
+_md5_=a704a23802d2ab6acc946f2207a84aa8
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-4.0.4 b/metadata/md5-cache/dev-php/pecl-apcu-4.0.4
new file mode 100644
index 000000000000..eeac42506da2
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-apcu-4.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DESCRIPTION=Stripped down version of APC supporting only user cache.
+EAPI=5
+HOMEPAGE=http://pecl.php.net/APCu
+IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-5 php_targets_php5-3 php_targets_php5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/APCu-4.0.4.tgz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=106840dcda37f21ae0cbc462c8e8d364
diff --git a/metadata/md5-cache/dev-php/pecl-mongo-1.5.1 b/metadata/md5-cache/dev-php/pecl-mongo-1.5.1
new file mode 100644
index 000000000000..8d12ee18202b
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-mongo-1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DESCRIPTION=MongoDB database driver
+EAPI=5
+HOMEPAGE=http://pecl.php.net/mongo
+IUSE=php_targets_php5-5 php_targets_php5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-4 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/mongo-1.5.1.tgz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=c959b229e6318e74a9a15738ca2040f1
diff --git a/metadata/md5-cache/dev-php/xdebug-client-2.2.5 b/metadata/md5-cache/dev-php/xdebug-client-2.2.5
new file mode 100644
index 000000000000..c2509d96a717
--- /dev/null
+++ b/metadata/md5-cache/dev-php/xdebug-client-2.2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=libedit? ( dev-libs/libedit )
+DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP).
+EAPI=5
+HOMEPAGE=http://www.xdebug.org/
+IUSE=libedit
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Xdebug
+RDEPEND=libedit? ( dev-libs/libedit )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/xdebug-2.2.5.tgz
+_md5_=5aa71657a657232264de71d2e51a849d
diff --git a/metadata/md5-cache/dev-python/authres-0.602 b/metadata/md5-cache/dev-python/authres-0.602
index a609354fceb6..1ff602e45cc2 100644
--- a/metadata/md5-cache/dev-python/authres-0.602
+++ b/metadata/md5-cache/dev-python/authres-0.602
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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=Authentication Results Header Module
 EAPI=5
 HOMEPAGE=https://launchpad.net/authentication-results-python http://pypi.python.org/pypi/authres
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
+IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
+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/authres/authres-0.602.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1c1f26cec063cc342c8e270ed1a4afc7
+_md5_=6600d3855b9443b399c293575b48dd4b
diff --git a/metadata/md5-cache/dev-python/autopep8-1.0.1 b/metadata/md5-cache/dev-python/autopep8-1.0.1
new file mode 100644
index 000000000000..eabd4a5fe489
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autopep8-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=dev-python/pep8-1.5.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/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(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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=Automatically formats Python code to conform to the PEP 8 style guide
+EAPI=5
+HOMEPAGE=https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/pep8-1.5.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=https://github.com/hhatto/autopep8/tarball/ver1.0.1 -> autopep8-1.0.1.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=83917a97d7f8e4b817ac0c97ce39ab26
diff --git a/metadata/md5-cache/dev-python/celery-3.0.12 b/metadata/md5-cache/dev-python/celery-3.0.12
deleted file mode 100644
index f0f9649bff77..000000000000
--- a/metadata/md5-cache/dev-python/celery-3.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz test? ( dev-python/gevent >=dev-python/mock-0.7.0 virtual/python-unittest2 dev-python/pyopenssl dev-python/nose-cover3 dev-python/sqlalchemy dev-python/pymongo dev-python/redis-py dev-db/redis ) doc? ( dev-python/docutils dev-python/sphinx dev-python/jinja dev-python/sphinxcontrib-issuetracker dev-python/sqlalchemy ) dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* ) test? ( dev-python/nose )
-DESCRIPTION=Celery is an open source asynchronous task queue/job queue based on distributed message passing.
-EAPI=4
-HOMEPAGE=http://celeryproject.org/ http://pypi.python.org/pypi/celery
-IUSE=doc examples sql test test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* )
-SLOT=0
-SRC_URI=mirror://pypi/c/celery/celery-3.0.12.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d0da52dc3d0c8761289831d79bc47f45
diff --git a/metadata/md5-cache/dev-python/celery-3.0.13 b/metadata/md5-cache/dev-python/celery-3.0.13
deleted file mode 100644
index dfe0e9b63e01..000000000000
--- a/metadata/md5-cache/dev-python/celery-3.0.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz test? ( dev-python/gevent >=dev-python/mock-0.7.0 virtual/python-unittest2 dev-python/pyopenssl dev-python/nose-cover3 dev-python/sqlalchemy dev-python/pymongo dev-python/redis-py dev-db/redis ) doc? ( dev-python/docutils dev-python/sphinx dev-python/jinja dev-python/sphinxcontrib-issuetracker dev-python/sqlalchemy ) dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* ) test? ( dev-python/nose )
-DESCRIPTION=Celery is an open source asynchronous task queue/job queue based on distributed message passing.
-EAPI=4
-HOMEPAGE=http://celeryproject.org/ http://pypi.python.org/pypi/celery
-IUSE=doc examples sql test test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* )
-SLOT=0
-SRC_URI=mirror://pypi/c/celery/celery-3.0.13.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2ace0b11fbf63e0c2a40755e00c5126a
diff --git a/metadata/md5-cache/dev-python/celery-3.0.15 b/metadata/md5-cache/dev-python/celery-3.0.15
deleted file mode 100644
index 9ef314642fcd..000000000000
--- a/metadata/md5-cache/dev-python/celery-3.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz test? ( dev-python/gevent >=dev-python/mock-0.7.0 virtual/python-unittest2 dev-python/pyopenssl dev-python/nose-cover3 dev-python/sqlalchemy dev-python/pymongo dev-python/redis-py dev-db/redis ) doc? ( dev-python/docutils dev-python/sphinx dev-python/jinja dev-python/sphinxcontrib-issuetracker dev-python/sqlalchemy ) dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* ) test? ( dev-python/nose )
-DESCRIPTION=Celery is an open source asynchronous task queue/job queue based on distributed message passing.
-EAPI=4
-HOMEPAGE=http://celeryproject.org/ http://pypi.python.org/pypi/celery
-IUSE=doc examples sql test test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* )
-SLOT=0
-SRC_URI=mirror://pypi/c/celery/celery-3.0.15.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a73be3540b9e3eab0a9dc9135fc04f98
diff --git a/metadata/md5-cache/dev-python/celery-3.0.16 b/metadata/md5-cache/dev-python/celery-3.0.16
deleted file mode 100644
index 24a82bd29e28..000000000000
--- a/metadata/md5-cache/dev-python/celery-3.0.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz test? ( dev-python/gevent >=dev-python/mock-0.7.0 virtual/python-unittest2 dev-python/pyopenssl dev-python/nose-cover3 dev-python/sqlalchemy dev-python/pymongo dev-python/redis-py dev-db/redis ) doc? ( dev-python/docutils dev-python/sphinx dev-python/jinja dev-python/sphinxcontrib-issuetracker dev-python/sqlalchemy ) dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* ) test? ( dev-python/nose )
-DESCRIPTION=Celery is an open source asynchronous task queue/job queue based on distributed message passing.
-EAPI=4
-HOMEPAGE=http://celeryproject.org/ http://pypi.python.org/pypi/celery
-IUSE=doc examples sql test test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* )
-SLOT=0
-SRC_URI=mirror://pypi/c/celery/celery-3.0.16.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=53e9263ae0db27ed1b586455ce0658dc
diff --git a/metadata/md5-cache/dev-python/celery-3.0.17 b/metadata/md5-cache/dev-python/celery-3.0.17
deleted file mode 100644
index 46bfefe35e68..000000000000
--- a/metadata/md5-cache/dev-python/celery-3.0.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz test? ( dev-python/gevent >=dev-python/mock-0.7.0 virtual/python-unittest2 dev-python/pyopenssl dev-python/nose-cover3 dev-python/sqlalchemy dev-python/pymongo dev-python/redis-py dev-db/redis ) doc? ( dev-python/docutils dev-python/sphinx dev-python/jinja dev-python/sphinxcontrib-issuetracker dev-python/sqlalchemy ) dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* ) test? ( dev-python/nose )
-DESCRIPTION=Celery is an open source asynchronous task queue/job queue based on distributed message passing.
-EAPI=4
-HOMEPAGE=http://celeryproject.org/ http://pypi.python.org/pypi/celery
-IUSE=doc examples sql test test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/kombu-2.4.7 <dev-python/kombu-3.0 sql? ( dev-python/sqlalchemy ) dev-python/python-dateutil >=dev-python/anyjson-0.3.3 dev-python/pyparsing >=dev-python/billiard-2.7.3.17 dev-python/pytz || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* )
-SLOT=0
-SRC_URI=mirror://pypi/c/celery/celery-3.0.17.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=940f7b2bf2649e78f6ea8a539127a0d0
diff --git a/metadata/md5-cache/dev-python/celery-3.0.19 b/metadata/md5-cache/dev-python/celery-3.0.19
deleted file mode 100644
index f8c5dbf1e8d6..000000000000
--- a/metadata/md5-cache/dev-python/celery-3.0.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=<dev-python/kombu-3 >=dev-python/kombu-2.5.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/billiard-2.7.3.28[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose-cover3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-db/redis ) doc? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinxcontrib-issuetracker[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Celery is an open source asynchronous task queue/job queue based on distributed message passing.
-EAPI=5
-HOMEPAGE=http://celeryproject.org/ http://pypi.python.org/pypi/celery
-IUSE=doc examples test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=<dev-python/kombu-3 >=dev-python/kombu-2.5.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/billiard-2.7.3.28[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/c/celery/celery-3.0.19.tar.gz
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2adc79f39f8dc9d4b30e7bc6841ccccc
diff --git a/metadata/md5-cache/dev-python/celery-3.1.11 b/metadata/md5-cache/dev-python/celery-3.1.11
new file mode 100644
index 000000000000..92e598576491
--- /dev/null
+++ b/metadata/md5-cache/dev-python/celery-3.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=<dev-python/kombu-4 >=dev-python/kombu-3.0.15[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/billiard-3.3.0.17[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/billiard-3.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] virtual/python-unittest2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/nose-cover3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-db/redis-2.8.0 ) ) doc? ( dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Celery is an open source asynchronous task queue/job queue based on distributed message passing.
+EAPI=5
+HOMEPAGE=http://celeryproject.org/ http://pypi.python.org/pypi/celery
+IUSE=doc examples redis test python_targets_python2_7 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/kombu-4 >=dev-python/kombu-3.0.15[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/billiard-3.3.0.17[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/billiard-3.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
+SLOT=0
+SRC_URI=mirror://pypi/c/celery/celery-3.1.11.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=65ccf89396b475b28033290d627824fa
diff --git a/metadata/md5-cache/dev-python/cherrypy-3.3.0 b/metadata/md5-cache/dev-python/cherrypy-3.3.0
new file mode 100644
index 000000000000..7e2374c98ded
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cherrypy-3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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=CherryPy is a pythonic, object-oriented HTTP framework
+EAPI=5
+HOMEPAGE=http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6 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/CherryPy/CherryPy-3.3.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=2ef3b77f45d4904f3d48ce2f59feac82
diff --git a/metadata/md5-cache/dev-python/demjson-2.0 b/metadata/md5-cache/dev-python/demjson-2.0
new file mode 100644
index 000000000000..6b57a0cfaf9d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/demjson-2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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=encoder, decoder, and lint/validator for JSON (JavaScript Object Notation) compliant with RFC 4627
+EAPI=5
+HOMEPAGE=http://deron.meranda.us/python/demjson/ http://pypi.python.org/pypi/demjson
+IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=http://deron.meranda.us/python/demjson/dist/demjson-2.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=6c12357006e33102c04359ec56235458
diff --git a/metadata/md5-cache/dev-python/django-1.4.11 b/metadata/md5-cache/dev-python/django-1.4.11
index fb144097a9c5..17d0bf7feefa 100644
--- a/metadata/md5-cache/dev-python/django-1.4.11
+++ b/metadata/md5-cache/dev-python/django-1.4.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=virtual/python-imaging[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) test? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
+DEPEND=virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( 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(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)] >=app-admin/webapp-config-1.50.15
 DESCRIPTION=High-level Python web framework
 EAPI=5
 HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
-IUSE=mysql postgres sqlite test python_targets_python2_6 python_targets_python2_7 vhosts
+IUSE=mysql postgres sqlite test python_targets_python2_7 vhosts
 KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=virtual/python-imaging[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+RDEPEND=virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[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(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.4/Django-1.4.11.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=c2767fa5ce0fe587d07ed68c78ffa8f0
+_md5_=a0f90d766e1783a6e38b6aee746ee035
diff --git a/metadata/md5-cache/dev-python/django-1.4.12 b/metadata/md5-cache/dev-python/django-1.4.12
new file mode 100644
index 000000000000..9cac02f7efad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-1.4.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( 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(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)] >=app-admin/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=5
+HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
+IUSE=mysql postgres sqlite test python_targets_python2_7 vhosts
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[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(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/1.4/Django-1.4.12.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=9b967e8d080719344b5bac37c71e7edf
diff --git a/metadata/md5-cache/dev-python/django-1.5.7 b/metadata/md5-cache/dev-python/django-1.5.7
new file mode 100644
index 000000000000..051673ac31c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-1.5.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=virtual/python-imaging[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(-)] postgres? ( dev-python/psycopg:2[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-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( >=dev-python/sphinx-1.0.7[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(-)] ) test? ( 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(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)] >=app-admin/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=5
+HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
+IUSE=doc mysql postgres sqlite test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=virtual/python-imaging[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(-)] postgres? ( dev-python/psycopg:2[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-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_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(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=mysql? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/1.5/Django-1.5.7.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=957e3296fa7852dad75dc4137f6177f9
diff --git a/metadata/md5-cache/dev-python/django-1.6.4 b/metadata/md5-cache/dev-python/django-1.6.4
new file mode 100644
index 000000000000..0fceeb8959d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-1.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=virtual/python-imaging[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( >=dev-python/sphinx-1.0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=app-admin/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=5
+HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
+IUSE=doc mysql postgres sqlite test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=virtual/python-imaging[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=mysql? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/1.6/Django-1.6.4.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=5c480af8bac242be8d13453bbefc6ff0
diff --git a/metadata/md5-cache/dev-python/django-pipeline-1.3.17 b/metadata/md5-cache/dev-python/django-pipeline-1.3.17
new file mode 100644
index 000000000000..27d0ff2b026a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-pipeline-1.3.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/django-1.5.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/jsmin[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx ) test? ( dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=An asset packaging library for Django
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/django-1.5.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/jsmin[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/cyberdelia/django-pipeline/archive/1.3.17.tar.gz -> django-pipeline-1.3.17-gh.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=583d1a00f1fd75561223fb079dd4daaa
diff --git a/metadata/md5-cache/dev-python/drpython-3.11.4 b/metadata/md5-cache/dev-python/drpython-3.11.4
new file mode 100644
index 000000000000..67c32d3dce11
--- /dev/null
+++ b/metadata/md5-cache/dev-python/drpython-3.11.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/wxpython-2.6 app-arch/unzip userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A powerful cross-platform IDE for Python
+EAPI=5
+HOMEPAGE=http://drpython.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/wxpython-2.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/drpython/DrPython_3.11.4.zip
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=72e558cb92b695eed918f8fd35d67902
diff --git a/metadata/md5-cache/dev-python/encore-0.5.1 b/metadata/md5-cache/dev-python/encore-0.5.1
new file mode 100644
index 000000000000..dd5d61725e9a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/encore-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Enthought Tool Suite: collection of core-level utility modules
+EAPI=5
+HOMEPAGE=https://github.com/enthought/encore
+IUSE=doc examples test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/e/encore/encore-0.5.1.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=363a27f5c714877f819e33d90a9eab04
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.9.5 b/metadata/md5-cache/dev-python/flask-wtf-0.9.5
new file mode 100644
index 000000000000..7afddb1b5159
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.9.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/flask[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/wtforms-1.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/flask-testing[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/flask-uploads[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/speaklater[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/flask-babel[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Simple integration of Flask and WTForms, including CSRF, file upload and Recaptcha integration.
+EAPI=5
+HOMEPAGE=http://pythonhosted.org/Flask-WTF/ https://pypi.python.org/pypi/Flask-WTF
+IUSE=test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flask[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/wtforms-1.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.9.5.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=7ed101ada908dc3cf64511e6144d09cf
diff --git a/metadata/md5-cache/dev-python/isodate-0.5.0 b/metadata/md5-cache/dev-python/isodate-0.5.0
new file mode 100644
index 000000000000..a2b2ebeb3ab8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/isodate-0.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DESCRIPTION=ISO 8601 date/time/duration parser and formater
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/isodate
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/i/isodate/isodate-0.5.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ec51c304f9a55547ba090ef555f552bc
diff --git a/metadata/md5-cache/dev-python/llvmpy-0.12.5 b/metadata/md5-cache/dev-python/llvmpy-0.12.5
new file mode 100644
index 000000000000..ec5554681043
--- /dev/null
+++ b/metadata/md5-cache/dev-python/llvmpy-0.12.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==sys-devel/llvm-3.3*:=[multitarget] doc? ( dev-python/sphinx ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Python wrapper around the llvm C++ library
+EAPI=5
+HOMEPAGE=http://llvmpy.org/
+IUSE=doc python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND==sys-devel/llvm-3.3*:=[multitarget] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=https://github.com/llvmpy/llvmpy/archive/0.12.5.tar.gz -> llvmpy-0.12.5.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=71ab0deafb290f21665ed035eb1c8e56
diff --git a/metadata/md5-cache/dev-python/lxml-3.3.5 b/metadata/md5-cache/dev-python/lxml-3.3.5
index 626b6a25f517..07e2d1cac87f 100644
--- a/metadata/md5-cache/dev-python/lxml-3.3.5
+++ b/metadata/md5-cache/dev-python/lxml-3.3.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) dev-python/setuptools[python_targets_python2_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(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)]
 DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=5
 HOMEPAGE=http://lxml.de/ http://pypi.python.org/pypi/lxml/
-IUSE=beautifulsoup3 doc examples +threads python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+IUSE=beautifulsoup3 doc examples +threads python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
-RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) python_targets_python2_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/l/lxml/lxml-3.3.5.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=813360d8172a5ad7c34fd71a7298d4bb
+_md5_=3e5226844a51c232dbbb5e20d555c957
diff --git a/metadata/md5-cache/dev-python/pSQL-1.2.1 b/metadata/md5-cache/dev-python/pSQL-1.2.1
new file mode 100644
index 000000000000..ce8d21fb66fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pSQL-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=MySQL abstraction layer for python
+EAPI=5
+HOMEPAGE=http://software.fionet.com/pSQL/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/mysql-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/egenix-mx-base[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://software.fionet.com/pSQL/release/pSQL-1.2.1.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=74e5174486dcec71fa5c096d46c74e13
diff --git a/metadata/md5-cache/dev-python/pep8-1.5.6 b/metadata/md5-cache/dev-python/pep8-1.5.6
new file mode 100644
index 000000000000..a6cfb5d49b7b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pep8-1.5.6
@@ -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(-)] 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(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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=Python style guide checker
+EAPI=5
+HOMEPAGE=http://github.com/jcrocholl/pep8 http://pypi.python.org/pypi/pep8
+IUSE=doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/p/pep8/pep8-1.5.6.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ec219dcc40b372611fa53a64ad58c3ff
diff --git a/metadata/md5-cache/dev-python/pip-1.5.5 b/metadata/md5-cache/dev-python/pip-1.5.5
new file mode 100644
index 000000000000..07f7f5b72c91
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pip-1.5.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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=Installs python packages -- replacement for easy_install
+EAPI=5
+HOMEPAGE=http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/
+IUSE=zsh-completion python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pip/pip-1.5.5.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ce747b4cec9241a6247e3eadee7bf00c
diff --git a/metadata/md5-cache/dev-python/pydns-3.0.2-r1 b/metadata/md5-cache/dev-python/pydns-3.0.2-r1
index f66b3d9f4a73..07a0a925f306 100644
--- a/metadata/md5-cache/dev-python/pydns-3.0.2-r1
+++ b/metadata/md5-cache/dev-python/pydns-3.0.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libiconv userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=virtual/libiconv userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)]
 DESCRIPTION=Python module for DNS (Domain Name Service)
 EAPI=5
 HOMEPAGE=http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns
-IUSE=examples python_targets_python3_2 python_targets_python3_3
+IUSE=examples python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=amd64 ~ia64 x86
 LICENSE=CNRI
-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 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python3_2 python_targets_python3_3 )
+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 )
 RESTRICT=test
 SLOT=3
 SRC_URI=http://downloads.sourceforge.net/project/pydns/py3dns/py3dns-3.0.2.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0e3f38c5fa604bd2214c040b54b31fe3
+_md5_=55a5130a62be97fa8434011e9b940418
diff --git a/metadata/md5-cache/dev-python/pygeocoder-1.2.4 b/metadata/md5-cache/dev-python/pygeocoder-1.2.4
new file mode 100644
index 000000000000..884852b8cadf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygeocoder-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Python wrapper for Google Geocoding API V3
+EAPI=5
+HOMEPAGE=http://code.xster.net/pygeocoder/overview
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://code.xster.net/pygeocoder/downloads/pygeocoder-1.2.4.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=d373e5ffb689ef4d69338e9ceb611e7f
diff --git a/metadata/md5-cache/dev-python/pygments-1.6_p20140324 b/metadata/md5-cache/dev-python/pygments-1.6_p20140324
index bf75e9722b63..8f0d094eccf1 100644
--- a/metadata/md5-cache/dev-python/pygments-1.6_p20140324
+++ b/metadata/md5-cache/dev-python/pygments-1.6_p20140324
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> pygments-1.6_p20140324.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=e708a8074a23ace5107ea08d12ecc39a
+_md5_=a101dc75b30f875d72fc32f88a31de59
diff --git a/metadata/md5-cache/dev-python/pypy-bin-2.2.1 b/metadata/md5-cache/dev-python/pypy-bin-2.2.1-r1
similarity index 50%
rename from metadata/md5-cache/dev-python/pypy-bin-2.2.1
rename to metadata/md5-cache/dev-python/pypy-bin-2.2.1-r1
index 0c6338de4d3c..2038c0800825 100644
--- a/metadata/md5-cache/dev-python/pypy-bin-2.2.1
+++ b/metadata/md5-cache/dev-python/pypy-bin-2.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=app-arch/xz-utils doc? ( dev-python/sphinx ) test? ( ~app-arch/bzip2-1.0.6:0 ~dev-libs/expat-2.1.0:0 ( <dev-libs/libffi-3.0.14:0 >=dev-libs/libffi-3.0.11:0 ) ( <dev-libs/openssl-1.0.1h:0 >=dev-libs/openssl-1.0.1c:0 ) ( <sys-libs/glibc-2.20:2.2 >=sys-libs/glibc-2.15:2.2 ) ~sys-libs/ncurses-5.9:5[tinfo] ( <sys-libs/zlib-1.2.9:0 >=sys-libs/zlib-1.2.7:0 ) sqlite? ( dev-db/sqlite:3 ) !dev-python/pypy:0 )
+DEPEND=app-arch/xz-utils doc? ( dev-python/sphinx ) test? ( ~app-arch/bzip2-1.0.6:0 ~dev-libs/expat-2.1.0:0 ( <dev-libs/libffi-3.0.14:0 >=dev-libs/libffi-3.0.11:0 ) ( <dev-libs/openssl-1.0.1h:0 >=dev-libs/openssl-1.0.1c:0 ) ( <sys-libs/glibc-2.20:2.2 >=sys-libs/glibc-2.15:2.2 ) ~sys-libs/ncurses-5.9:5 ( <sys-libs/zlib-1.2.9:0 >=sys-libs/zlib-1.2.7:0 ) sqlite? ( dev-db/sqlite:3 ) !dev-python/pypy:0 )
 DESCRIPTION=A fast, compliant alternative implementation of the Python language (binary package)
 EAPI=5
 HOMEPAGE=http://pypy.org/
@@ -7,9 +7,9 @@ IUSE=doc +jit shadowstack sqlite sse2 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 PDEPEND=app-admin/python-updater
-RDEPEND=~app-arch/bzip2-1.0.6:0 ~dev-libs/expat-2.1.0:0 ( <dev-libs/libffi-3.0.14:0 >=dev-libs/libffi-3.0.11:0 ) ( <dev-libs/openssl-1.0.1h:0 >=dev-libs/openssl-1.0.1c:0 ) ( <sys-libs/glibc-2.20:2.2 >=sys-libs/glibc-2.15:2.2 ) ~sys-libs/ncurses-5.9:5[tinfo] ( <sys-libs/zlib-1.2.9:0 >=sys-libs/zlib-1.2.7:0 ) sqlite? ( dev-db/sqlite:3 ) !dev-python/pypy:0
+RDEPEND=~app-arch/bzip2-1.0.6:0 ~dev-libs/expat-2.1.0:0 ( <dev-libs/libffi-3.0.14:0 >=dev-libs/libffi-3.0.11:0 ) ( <dev-libs/openssl-1.0.1h:0 >=dev-libs/openssl-1.0.1c:0 ) ( <sys-libs/glibc-2.20:2.2 >=sys-libs/glibc-2.15:2.2 ) ~sys-libs/ncurses-5.9:5 ( <sys-libs/zlib-1.2.9:0 >=sys-libs/zlib-1.2.7:0 ) sqlite? ( dev-db/sqlite:3 ) !dev-python/pypy:0
 REQUIRED_USE=!jit? ( !shadowstack ) x86? ( !sse2? ( !jit !shadowstack ) )
 SLOT=0/2.2
-SRC_URI=mirror://bitbucket/pypy/pypy/downloads/pypy-2.2.1-src.tar.bz2 amd64? ( jit? ( shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz ) ) jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-amd64+bzip2+jit+ncurses.tar.xz ) ) !jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-amd64+bzip2+ncurses.tar.xz ) ) ) x86? ( sse2? ( jit? ( shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz ) ) jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-x86+bzip2+jit+ncurses+sse2.tar.xz ) ) !jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-x86+bzip2+ncurses+sse2.tar.xz ) ) ) !sse2? ( !jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-x86+bzip2+ncurses.tar.xz ) ) ) )
+SRC_URI=mirror://bitbucket/pypy/pypy/downloads/pypy-2.2.1-src.tar.bz2 amd64? ( jit? ( shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz -> pypy-bin-2.2.1-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz ) ) jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-amd64+bzip2+jit+ncurses.tar.xz -> pypy-bin-2.2.1-r1-amd64+bzip2+jit+ncurses.tar.xz ) ) !jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-amd64+bzip2+ncurses.tar.xz -> pypy-bin-2.2.1-r1-amd64+bzip2+ncurses.tar.xz ) ) ) x86? ( sse2? ( jit? ( shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz -> pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz ) ) jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-x86+bzip2+jit+ncurses+sse2.tar.xz -> pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz ) ) !jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-x86+bzip2+ncurses+sse2.tar.xz -> pypy-bin-2.2.1-r1-x86+bzip2+ncurses+sse2.tar.xz ) ) ) !sse2? ( !jit? ( !shadowstack? ( http://pypy.aliceinwire.net/pypy-bin//pypy-bin-2.2.1-x86+bzip2+ncurses.tar.xz -> pypy-bin-2.2.1-r1-x86+bzip2+ncurses.tar.xz ) ) ) )
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=90ec928431cc068bfc959c9100f0d3f2
+_md5_=f8147878ae3b977aa62785a47af4ffff
diff --git a/metadata/md5-cache/dev-python/pyramid-1.5 b/metadata/md5-cache/dev-python/pyramid-1.5
new file mode 100644
index 000000000000..269699e1c323
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyramid-1.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/chameleon[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/mako[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/webob[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/repoze-lru[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/mako[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(-)] net-zope/zope-interface[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/translationstring[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/pastedeploy[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/venusian[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/setuptools[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(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)]
+DESCRIPTION=A small open source Python web framework.
+EAPI=5
+HOMEPAGE=http://www.pylonsproject.org/
+IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=repoze
+RDEPEND=dev-python/chameleon[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/mako[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/webob[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/repoze-lru[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/mako[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(-)] net-zope/zope-interface[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/translationstring[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/pastedeploy[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/venusian[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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pyramid/pyramid-1.5.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=cd9b637b267b6f93bb2fc4bc53ed5dd4
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.9 b/metadata/md5-cache/dev-python/pyspf-2.0.9
new file mode 100644
index 000000000000..a12aaeb821f8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyspf-2.0.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/authres[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pydns:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_3? ( dev-python/pydns:3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/pydns:3[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_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ipv6?] ) python_targets_python3_4? ( dev-lang/python:3.4[ipv6?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python implementation of the Sender Policy Framework (SPF) protocol
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/pyspf
+IUSE=ipv6 test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/authres[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pydns:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_3? ( dev-python/pydns:3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/pydns:3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ipv6?] ) python_targets_python3_4? ( dev-lang/python:3.4[ipv6?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=test? ( ipv6 ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyspf/pyspf-2.0.9.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=067113cd821b625acb172031e745526f
diff --git a/metadata/md5-cache/dev-python/python-bibtex-1.2.7 b/metadata/md5-cache/dev-python/python-bibtex-1.2.7
new file mode 100644
index 000000000000..218c8cd7eb5f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-bibtex-1.2.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 >=app-text/recode-3.6-r1 virtual/pkgconfig =dev-lang/python-2*
+DESCRIPTION=A Python extension to parse BibTeX files
+EAPI=3
+HOMEPAGE=http://pybliographer.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=app-text/recode-3.6-r1 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sourceforge/pybliographer/python-bibtex-1.2.7.tar.gz
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=b8c23fa161d9b677fa71431cf529789e
diff --git a/metadata/md5-cache/dev-python/python-caja-1.6.1 b/metadata/md5-cache/dev-python/python-caja-1.6.1
index 6b9924f37f31..da05523844fe 100644
--- a/metadata/md5-cache/dev-python/python-caja-1.6.1
+++ b/metadata/md5-cache/dev-python/python-caja-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Python bindings for the Caja file manager
 EAPI=5
 HOMEPAGE=http://www.mate-desktop.org
 IUSE=doc python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-python/pygobject:3[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=mate-base/mate-file-manager-1.6:0[introspection] x11-libs/gtk+:2 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/python-caja-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=05181fadc0ff0cb4d7cda84dbb514147
+_md5_=7fe89e195528cd6fe5195ecbb3a966cb
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.1.10 b/metadata/md5-cache/dev-python/python-sqlparse-0.1.10
index a4dac862f478..00156420ded5 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.1.10
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=A non-validating SQL parser module for Python
 EAPI=5
 HOMEPAGE=http://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=https://github.com/andialbrecht/sqlparse/archive/0.1.10.tar.gz -> python-sqlparse-0.1.10.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=48f8c892553842a882f9689357772e5b
+_md5_=54dd35c768c41214a6fc08a4de46e696
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.1.11 b/metadata/md5-cache/dev-python/python-sqlparse-0.1.11
new file mode 100644
index 000000000000..126d301c1b94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.1.11
@@ -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_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] test? ( dev-python/pytest[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(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)]
+DESCRIPTION=A non-validating SQL parser module for Python
+EAPI=5
+HOMEPAGE=http://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse
+IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=https://github.com/andialbrecht/sqlparse/archive/0.1.11.tar.gz -> python-sqlparse-0.1.11.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=5c1fc2cfe18eaaf992bac4d9a2fa3ee5
diff --git a/metadata/md5-cache/dev-python/pyx-0.13 b/metadata/md5-cache/dev-python/pyx-0.13
new file mode 100644
index 000000000000..ce48fb753d00
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyx-0.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/tex-base doc? ( virtual/latex-base ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)]
+DESCRIPTION=Python package for the generation of encapsulated PostScript figures
+EAPI=5
+HOMEPAGE=http://pyx.sourceforge.net/
+IUSE=doc python_targets_python3_3
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=virtual/tex-base python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python3_3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/pyx/PyX-0.13.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=3e70116884902e1f5a1e6809bc05ac7f
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.10-r1 b/metadata/md5-cache/dev-python/pyyaml-3.10-r1
index 68c6cc6c5155..9635ae99ed0d 100644
--- a/metadata/md5-cache/dev-python/pyyaml-3.10-r1
+++ b/metadata/md5-cache/dev-python/pyyaml-3.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=YAML parser and emitter for Python
 EAPI=5
 HOMEPAGE=http://pyyaml.org/wiki/PyYAML http://pypi.python.org/pypi/PyYAML
 IUSE=examples libyaml python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 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 ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=http://pyyaml.org/download/pyyaml/PyYAML-3.10.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7a4faab9270966e5cdf2eb5b8d5d6283
+_md5_=438d4fa314d403b42080031caa6306f9
diff --git a/metadata/md5-cache/dev-python/scrapy-0.18.1 b/metadata/md5-cache/dev-python/scrapy-0.18.1
new file mode 100644
index 000000000000..8afe1c12e652
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scrapy-0.18.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/queuelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-ftp/vsftpd ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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(-)]
+DESCRIPTION=A high-level Python Screen Scraping framework
+EAPI=5
+HOMEPAGE=http://scrapy.org http://pypi.python.org/pypi/Scrapy/
+IUSE=boto doc examples ibl test ssl python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] boto? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ibl? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-mail dev-python/twisted-web >=dev-python/w3lib-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/scrapy/scrapy/archive/0.18.1.tar.gz -> scrapy-0.18.1.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=e2428228250b4b4cdd1fd6d0dbf96746
diff --git a/metadata/md5-cache/dev-python/serpent-1.5 b/metadata/md5-cache/dev-python/serpent-1.5
new file mode 100644
index 000000000000..880e1ee3e8f8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/serpent-1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DESCRIPTION=A simple serialization library based on ast.literal_eval
+EAPI=5
+HOMEPAGE=https://pypi.python.org/packages/source/s/serpent/
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/s/serpent/serpent-1.5.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=18d62517906f273c5fef6dd0381017db
diff --git a/metadata/md5-cache/dev-python/testify-0.3.0 b/metadata/md5-cache/dev-python/testify-0.3.0
new file mode 100644
index 000000000000..f02b31e23695
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testify-0.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] test? ( dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/sqlalchemy www-servers/tornado[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=A more pythonic replacement for the unittest module and nose
+EAPI=5
+HOMEPAGE=https://github.com/Yelp/testify http://pypi.python.org/pypi/testify/
+IUSE=test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/sqlalchemy www-servers/tornado[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Yelp/testify/tarball/0.3.0 -> testify-0.3.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=2787474d810c729299cb48317c058427
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.4-r4 b/metadata/md5-cache/dev-python/testscenarios-0.4-r4
index b100f134e00f..37345ee8ccba 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.4-r4
+++ b/metadata/md5-cache/dev-python/testscenarios-0.4-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Testscenarios, a pyunit extension for dependency injection
 EAPI=5
 HOMEPAGE=https://launchpad.net/testscenarios
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/testtools[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
 SRC_URI=mirror://pypi/t/testscenarios/testscenarios-0.4.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f91c84d10c8a720d55f3256a6e119728
+_md5_=978cd81d689aed987d859dfdb819f0ab
diff --git a/metadata/md5-cache/dev-python/testtools-0.9.35 b/metadata/md5-cache/dev-python/testtools-0.9.35
new file mode 100644
index 000000000000..2a3030d86718
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testtools-0.9.35
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( python_targets_python2_7? ( dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DESCRIPTION=Extensions to the Python unittest library
+EAPI=5
+HOMEPAGE=https://launchpad.net/testtools http://pypi.python.org/pypi/testtools
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_pypy
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
+SLOT=0
+SRC_URI=http://launchpad.net/testtools/trunk/0.9.35/+download/testtools-0.9.35.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=11b2c8f009587b59359f0aa29f3f9fe9
diff --git a/metadata/md5-cache/dev-python/tox-1.7.1 b/metadata/md5-cache/dev-python/tox-1.7.1
new file mode 100644
index 000000000000..ab6c1d59b753
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-1.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/virtualenv-1.11.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pip[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/py-1.4.17[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=5
+HOMEPAGE=http://tox.testrun.org http://pypi.python.org/pypi/tox
+IUSE=doc python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/virtualenv-1.11.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pip[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/py-1.4.17[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/t/tox/tox-1.7.1.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=95aea2e122021d86f5fc104f67ee5d2c
diff --git a/metadata/md5-cache/dev-python/twitter-1.14.3 b/metadata/md5-cache/dev-python/twitter-1.14.3
new file mode 100644
index 000000000000..1d6930635c69
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twitter-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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=An API and command-line toolset for Twitter (twitter.com)
+EAPI=5
+HOMEPAGE=http://mike.verdone.ca/twitter/
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6 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/twitter/twitter-1.14.3.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=657fedf05ab939828de76cc58b297521
diff --git a/metadata/md5-cache/dev-python/virtualenv-1.11.5 b/metadata/md5-cache/dev-python/virtualenv-1.11.5
new file mode 100644
index 000000000000..d5ba920e006c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-1.11.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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/mock[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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=Virtual Python Environment builder
+EAPI=5
+HOMEPAGE=http://www.virtualenv.org/ http://pypi.python.org/pypi/virtualenv
+IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=https://github.com/pypa/virtualenv/archive/1.11.5.tar.gz -> virtualenv-1.11.5.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=476aaf185588d4c431bdcda0649c1eed
diff --git a/metadata/md5-cache/dev-python/ws4py-0.3.3 b/metadata/md5-cache/dev-python/ws4py-0.3.3
new file mode 100644
index 000000000000..0de1bbad1794
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ws4py-0.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-python/unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/cherrypy-3.2.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/gevent[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=WebSocket support for Python
+EAPI=5
+HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
+IUSE=+client +server test +threads python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/tarball/v0.3.3 -> ws4py-0.3.3.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=8fc0d3442588f2d3a793bd9f11391aa9
diff --git a/metadata/md5-cache/dev-python/wsgiintercept-0.6.2 b/metadata/md5-cache/dev-python/wsgiintercept-0.6.2
new file mode 100644
index 000000000000..cf4a8f504ecd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wsgiintercept-0.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( dev-python/httplib2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pytest-2.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/requests-2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+DESCRIPTION=WSGI application in place of a real URI for testing
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/wsgi_intercept https://github.com/cdent/python3-wsgi-intercept
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 )
+SLOT=0
+SRC_URI=mirror://pypi/w/wsgi_intercept/wsgi_intercept-0.6.2.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=dfb5ceedd72634c4167cb141572530e9
diff --git a/metadata/md5-cache/dev-python/wtf-peewee-0.2.0 b/metadata/md5-cache/dev-python/wtf-peewee-0.2.0
new file mode 100644
index 000000000000..2b5692418176
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wtf-peewee-0.2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/peewee[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wtforms[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Small python ORM
+EAPI=5
+HOMEPAGE=https://github.com/coleifer/peewee/
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/coleifer/wtf-peewee/archive/0.2.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=85c4985eb16ceb2fc923daa8ffdefdd2
diff --git a/metadata/md5-cache/dev-python/xhtml2pdf-0.0.6 b/metadata/md5-cache/dev-python/xhtml2pdf-0.0.6
new file mode 100644
index 000000000000..24d9ca42e9cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xhtml2pdf-0.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyPdf[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=PDF generator using HTML and CSS
+EAPI=5
+HOMEPAGE=http://www.xhtml2pdf.com/ http://pypi.python.org/pypi/xhtml2pdf/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyPdf[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/x/xhtml2pdf/xhtml2pdf-0.0.6.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=9f3620e7ce87953b5df48f160168b965
diff --git a/metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703 b/metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703
index a840f23d5403..e9e217df7684 100644
--- a/metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703
+++ b/metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703
@@ -4,7 +4,7 @@ DESCRIPTION=Additional Qt APIs for mobile devices and desktop platforms
 EAPI=4
 HOMEPAGE=http://qt-project.org/wiki/Category:Developing_with_Qt::QtMobility
 IUSE=bluetooth debug doc networkmanager pulseaudio qml +tools bearer connectivity +contacts feedback gallery location messaging multimedia organizer publishsubscribe sensors serviceframework systeminfo versit
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 PDEPEND=connectivity? ( bluetooth? ( app-mobilephone/obexd ) )
 RDEPEND=>=dev-qt/qtcore-4.7.0:4 bearer? ( networkmanager? ( net-misc/networkmanager >=dev-qt/qtdbus-4.7.0:4 ) ) connectivity? ( >=dev-qt/qtdbus-4.7.0:4 bluetooth? ( net-wireless/bluez ) ) contacts? ( >=dev-qt/qtgui-4.7.0:4 ) gallery? ( >=dev-qt/qtdbus-4.7.0:4 ) location? ( >=dev-qt/qtdeclarative-4.7.0:4 >=dev-qt/qtgui-4.7.0:4 >=dev-qt/qtsql-4.7.0:4[sqlite] ) messaging? ( >=net-libs/qmf-2.0_p201209 ) multimedia? ( media-libs/alsa-lib media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 x11-libs/libX11 x11-libs/libXext x11-libs/libXv >=dev-qt/qtgui-4.8.0-r4:4[xv] >=dev-qt/qtopengl-4.8.0:4 pulseaudio? ( media-sound/pulseaudio[alsa] ) ) publishsubscribe? ( tools? ( >=dev-qt/qtgui-4.7.0:4 ) ) qml? ( >=dev-qt/qtdeclarative-4.7.0:4 ) serviceframework? ( >=dev-qt/qtdbus-4.7.0:4 >=dev-qt/qtsql-4.7.0:4[sqlite] tools? ( >=dev-qt/qtgui-4.7.0:4 ) ) systeminfo? ( sys-apps/util-linux virtual/udev x11-libs/libX11 x11-libs/libXrandr >=dev-qt/qtdbus-4.7.0:4 >=dev-qt/qtgui-4.7.0:4 bluetooth? ( net-wireless/bluez ) networkmanager? ( net-misc/networkmanager ) ) versit? ( >=dev-qt/qtgui-4.7.0:4 )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( bearer connectivity contacts feedback gallery location messagi
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pesa/distfiles/qt-mobility-1.2.2_p20130703.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3f0855c3b2d5ba383b05137f40353346
+_md5_=4aa0c05f3d6479bdbc55424a4bc7a8c1
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
index 3b86f512cf1f..ce94c7703d60 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/zentest[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/hoe-seattlerb[ruby_targets_ruby18] virtual/ruby-minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) 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/zentest[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Allows to embed C/C++ in Ruby code
 EAPI=5
 HOMEPAGE=http://www.zenspider.com/ZSS/Products/RubyInline/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/zentest[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[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/RubyInline-3.12.2.gem
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=52fe174cc6190c5a24c0f2009a33ca81
+_md5_=03143a73aa7d49dc28b9ddc07ec1b6a6
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2-r1 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2-r1
deleted file mode 100644
index 53d997a8f210..000000000000
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/zentest[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/zentest[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/hoe-seattlerb[ruby_targets_ruby18] virtual/ruby-minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] virtual/ruby-minitest[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Allows to embed C/C++ in Ruby code
-EAPI=5
-HOMEPAGE=http://www.zenspider.com/ZSS/Products/RubyInline/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/zentest[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/zentest[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 )
-SLOT=0
-SRC_URI=mirror://rubygems/RubyInline-3.12.2.gem
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e8b03ad2bdba1cdbed3efc1a5ebc2566
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
new file mode 100644
index 000000000000..cb9cadf5e7f2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/zentest[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] virtual/ruby-minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) 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=Allows to embed C/C++ in Ruby code
+EAPI=5
+HOMEPAGE=http://www.zenspider.com/ZSS/Products/RubyInline/
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/zentest[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/RubyInline-3.12.3.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=dddf1e140157917f3507133b83812f68
diff --git a/metadata/md5-cache/dev-ruby/activemodel-3.2.17 b/metadata/md5-cache/dev-ruby/activemodel-3.2.17
index 9488035c1bc3..319dfb6a3f75 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-3.2.17
+++ b/metadata/md5-cache/dev-ruby/activemodel-3.2.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13.0:0.13[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/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby20] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby20] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/mocha-0.13.0:0.13[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=A toolkit for building modeling frameworks like Active Record and Active Resource.
 EAPI=5
 HOMEPAGE=http://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby20] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby20] >=dev-ruby/bcrypt-ruby-3.0.0[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=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1b873e2656e87b2f0dee81e967b54b54
+_md5_=3ec8729ee6cc57558b88cf1f02fbd88c
diff --git a/metadata/md5-cache/dev-ruby/activeresource-3.2.17 b/metadata/md5-cache/dev-ruby/activeresource-3.2.17
index 5d53af60da44..f50bb9bc6ccb 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-3.2.17
+++ b/metadata/md5-cache/dev-ruby/activeresource-3.2.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] dev-ruby/builder:3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] dev-ruby/builder:3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13.0:0.13[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/activesupport-3.2.17[ruby_targets_ruby19] dev-ruby/builder:3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby20] dev-ruby/builder:3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/mocha-0.13.0:0.13[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=Think Active Record for web resources..
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/activeresource/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] dev-ruby/builder:3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] dev-ruby/builder:3[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/activesupport-3.2.17[ruby_targets_ruby19] dev-ruby/builder:3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby20] dev-ruby/builder:3[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=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e8cea3bd0288d81892ac1d8228fd0ae4
+_md5_=4e79375df5aaae1292f7fc59003b36fc
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.0.3 b/metadata/md5-cache/dev-ruby/activesupport-4.0.3
index 1a45433ec383..1b09108c532f 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.0.3
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/activesupport/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby19] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby19] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby20] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby20] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby20] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby20] !!<dev-ruby/activesupport-3.0.11-r1:3.0[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=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.3.tar.gz -> rails-4.0.3.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cfcaff74f423391bc6c3e2c6deefd9f5
+_md5_=cdfd3127f4b0475f503293930982ec32
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.0.4 b/metadata/md5-cache/dev-ruby/activesupport-4.0.4
index eebd8fee9ef9..60297407194e 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.0.4
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/activesupport/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby19] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby19] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby20] >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby20] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby20] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby20] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby21] >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby21] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby21] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby21] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.4.tar.gz -> rails-4.0.4.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=8222ea9e7c1bc7a420854255961c4ce5
+_md5_=da87b1e27f48fc44eb2f000c30cda31a
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.1.0 b/metadata/md5-cache/dev-ruby/activesupport-4.1.0
index 4b7c6e8768d2..fd4c5ef4acfd 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.1.0
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/activesupport/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby19] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby19] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby19] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby19] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby20] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby20] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby20] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby20] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby21] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby21] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby21] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.0.tar.gz -> rails-4.1.0.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=2b9323c38d810ce261f57c75246d329f
+_md5_=b8808b6e723d2f20b30132ce9f8a8e6e
diff --git a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4 b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
index d86c9e29b82a..0302c0e58b5c 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
+++ b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/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_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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=A base class where almost all of the methods from Object and Kernel have been removed
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/blankslate
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+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 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/blankslate-2.1.2.4.gem
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3b78d8612a6da8cfcae699522d254051
+_md5_=f7b0f474a9d761380d1feae8538ec69f
diff --git a/metadata/md5-cache/dev-ruby/builder-2.1.2-r4 b/metadata/md5-cache/dev-ruby/builder-2.1.2-r4
new file mode 100644
index 000000000000..0bf69a237291
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/builder-2.1.2-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/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=A builder to facilitate programatic generation of XML markup
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/builder/
+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 ~s390 ~sh ~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://rubyforge/builder/builder-2.1.2.tgz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=30cc03bc524b377de5eec0aef89b27d5
diff --git a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1 b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
index aa5420af6bbe..f4c774d6c790 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
@@ -1,7 +1,7 @@
 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=A builder to facilitate programatic generation of XML markup
-EAPI=4
+EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/builder/
 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 SLOT=3
 SRC_URI=mirror://rubygems/builder-3.0.4.gem
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3f9a6892d7c78ab5ed982d74df957858
+_md5_=fdbed46a0eefca4231eb17e479ce2b04
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.6.4 b/metadata/md5-cache/dev-ruby/dalli-2.6.4
index f12136703110..d7b45f7bdd7f 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.6.4
+++ b/metadata/md5-cache/dev-ruby/dalli-2.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=A high performance pure Ruby client for accessing memcached servers.
 EAPI=5
 HOMEPAGE=http://github.com/mperham/dalli
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~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/dalli-2.6.4.gem
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=20e8eecf1ddce6108b00b5ad47a18c14
+_md5_=0caab76c0b4e978cb4af214f96da2bfc
diff --git a/metadata/md5-cache/dev-ruby/dotenv-deployment-0.0.2 b/metadata/md5-cache/dev-ruby/dotenv-deployment-0.0.2
new file mode 100644
index 000000000000..232b9e79d8da
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dotenv-deployment-0.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_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_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=Deployment concerns for dotenv
+EAPI=5
+HOMEPAGE=https://github.com/bkeepers/dotenv-deployment
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test
+KEYWORDS=~amd64
+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/dotenv-deployment-0.0.2.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=d73a58de2e2d25590eb41b79a68e3574
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.4.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.4.0
new file mode 100644
index 000000000000..b43d51021d02
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=factory_girl provides a framework and DSL for defining and using factories
+EAPI=5
+HOMEPAGE=https://github.com/thoughtbot/factory_girl
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=mirror://rubygems/factory_girl-4.4.0.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=47df427e806f3e8bf0cb9dca2f3618ae
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2
index e5586a5fe3e4..56e00859ccc4 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) 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] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A ruby library to handle HTTP cookies
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/http-cookie
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/domain_name-0.5:0[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/http-cookie-1.0.2.gem
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9203c0d0a05020f44bd165ebc8dcbc20
+_md5_=d9d05f818134377dc2940fce83195e5a
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.13.1 b/metadata/md5-cache/dev-ruby/httparty-0.13.1
new file mode 100644
index 000000000000..bb363c44e6ad
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/httparty-0.13.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/multi_json-1*[ruby_targets_ruby19] >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-ruby/rspec:0[ruby_targets_ruby19] dev-ruby/fakeweb[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=Makes http fun! Also, makes consuming restful web services dead easy.
+EAPI=5
+HOMEPAGE=http://httparty.rubyforge.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( =dev-ruby/multi_json-1*[ruby_targets_ruby19] >=dev-ruby/multi_xml-0.5.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 )
+SLOT=0
+SRC_URI=mirror://rubygems/httparty-0.13.1.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8cb0f7c7ea7e233b04d8cc44861d5b8e
diff --git a/metadata/md5-cache/dev-ruby/journey-1.0.4 b/metadata/md5-cache/dev-ruby/journey-1.0.4
deleted file mode 100644
index 540dc88cb651..000000000000
--- a/metadata/md5-cache/dev-ruby/journey-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Journey is a router. It routes requests.
-EAPI=4
-HOMEPAGE=https://github.com/rails/journey
-IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=1.0
-SRC_URI=mirror://rubygems/journey-1.0.4.gem
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ec19094db70f57a0236ea18e23524b22
diff --git a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
new file mode 100644
index 000000000000..d4677d3aa04a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/json[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=Journey is a router. It routes requests.
+EAPI=5
+HOMEPAGE=https://github.com/rails/journey
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos ~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=1.0
+SRC_URI=mirror://rubygems/journey-1.0.4.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=170ef9324f6ac66d3136967303c1b616
diff --git a/metadata/md5-cache/dev-ruby/mixlib-cli-1.5.0 b/metadata/md5-cache/dev-ruby/mixlib-cli-1.5.0
new file mode 100644
index 000000000000..07ed950a0673
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mixlib-cli-1.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/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=Mixin for creating command line applications
+EAPI=5
+HOMEPAGE=http://github.com/opscode/mixlib-cli
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+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/opscode/mixlib-cli/archive/1.5.0.tar.gz -> mixlib-cli-1.5.0.tgz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=34f507fe0afa5754e7dc83c79e9f4476
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
new file mode 100644
index 000000000000..f13b7b02e12f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/coderay[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/coderay[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/coderay[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/coderay[ruby_targets_jruby] ) ) test? ( 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? ( 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=A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock
+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=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=9f01ae8390de5eb97429198492373843
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1 b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
new file mode 100644
index 000000000000..b7ab85ea2661
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
@@ -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] ) ) test? ( 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? ( 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=A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock
+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
+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	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=3f630fbeb3db81afdb6a57ca1f041942
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.9.3 b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
new file mode 100644
index 000000000000..6a296e27674f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby20] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby20] =dev-ruby/activesupport-3*[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby21] =dev-ruby/activesupport-3*[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( || ( >=dev-ruby/json-1.4[ruby_targets_jruby] >=dev-ruby/yajl-ruby-0.7[ruby_targets_jruby] =dev-ruby/activesupport-3*[ruby_targets_jruby] ) ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby19] dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby20] dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rspec:2[ruby_targets_jruby] dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/json[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/yajl-ruby[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_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=A gem to provide swappable JSON backends
+EAPI=5
+HOMEPAGE=http://github.com/intridea/multi_json
+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 ~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/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby20] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby20] =dev-ruby/activesupport-3*[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby21] =dev-ruby/activesupport-3*[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( || ( >=dev-ruby/json-1.4[ruby_targets_jruby] >=dev-ruby/yajl-ruby-0.7[ruby_targets_jruby] =dev-ruby/activesupport-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=0
+SRC_URI=mirror://rubygems/multi_json-1.9.3.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=0644c6cd284653ef29fa1ae65cd97e25
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2 b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2
new file mode 100644
index 000000000000..794ee1666919
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_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=Numerical N-dimensional Array class
+EAPI=5
+HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_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/masa16/narray/archive/0.6.0.8.tar.gz -> narray-0.6.0.8.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=22240284fc455ec9ea50c97641e8556b
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.2.1 b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
new file mode 100644
index 000000000000..1a83278be86a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) test? ( >=dev-ruby/net-ssh-2.9.0[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby20] ) test? ( >=dev-ruby/net-ssh-2.9.0[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) test? ( >=dev-ruby/net-ssh-2.9.0[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=A pure Ruby implementation of the SCP client protocol
+EAPI=5
+HOMEPAGE=http://net-ssh.rubyforge.org/scp
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[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/net-scp-1.2.1.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=aad03e5e5c282f67723a6be9d4fd0366
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.9.0 b/metadata/md5-cache/dev-ruby/net-ssh-2.9.0
new file mode 100644
index 000000000000..734c71ba6db5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/mocha-0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( 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=Non-interactive SSH processing in pure Ruby
+EAPI=5
+HOMEPAGE=http://net-ssh.rubyforge.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=2.6
+SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.9.0.tar.gz -> net-ssh-git-2.9.0.tgz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=e46a5fd6fa7f6495f661baf251d6eec8
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.6.0 b/metadata/md5-cache/dev-ruby/parslet-1.6.0
new file mode 100644
index 000000000000..fce80895b855
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parslet-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/blankslate:2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/blankslate:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=A small PEG based parser library
+EAPI=5
+HOMEPAGE=https://github.com/kschiess/parslet
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/blankslate:2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/blankslate:2[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=https://github.com/kschiess/parslet/archive/1.6.0.tar.gz -> parslet-1.6.0.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=f6e8ae980ab07c0f819abce4aeae6e53
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4 b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
index 5649e0af628a..c33e15b2b3f6 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rack-test[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rack-test[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rack-test[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? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rack-test[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rack-test[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=Force SSL/TLS in your app.
 EAPI=5
 HOMEPAGE=https://github.com/josh/rack-ssl/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[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? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[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=1.3
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.3.4.tar.gz -> rack-ssl-1.3.4-git.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5abb78dfe50b42f70034bd965d90ef0c
+_md5_=f7f6c3768fd4f5c149acebb774a2f599
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.0 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.0
deleted file mode 100644
index f0a54404d840..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rack-test[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rack-test[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=Force SSL/TLS in your app.
-EAPI=5
-HOMEPAGE=https://github.com/josh/rack-ssl/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~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? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[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=1.4
-SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.0.tar.gz -> rack-ssl-1.4.0-git.tgz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7e5cbd1d1448e89c7ac6b80ee5c41c48
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0 b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0
deleted file mode 100644
index b2c219d90b67..000000000000
--- a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sci-libs/gsl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) 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=Ruby interface to GNU Scientific Library
-EAPI=5
-HOMEPAGE=http://rb-gsl.rubyforge.org/ https://github.com/david-macmahon/rb-gsl
-IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=sci-libs/gsl 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/rb-gsl-1.16.0.gem
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0249b7354d24904a8a5ef6f91e37b992
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.1 b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.1
new file mode 100644
index 000000000000..db0dd33da92b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sci-libs/gsl test? ( ruby_targets_ruby19? ( dev-ruby/narray[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/narray[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) 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=Ruby interface to GNU Scientific Library
+EAPI=5
+HOMEPAGE=http://rb-gsl.rubyforge.org/ https://github.com/david-macmahon/rb-gsl
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=sci-libs/gsl ruby_targets_ruby19? ( dev-ruby/narray[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/narray[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/rb-gsl-1.16.0.1.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=e3b442b6a01b2efd22d03b3b0645917a
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.4 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.4
new file mode 100644
index 000000000000..7d5655f2b56e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( 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_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ) 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? ( 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=A thorough inotify wrapper for Ruby using FFI.
+EAPI=5
+HOMEPAGE=https://github.com/nex3/rb-inotify
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos
+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_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_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/rb-inotify-0.9.4.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=dcfa4a8e13b7e35c8ab754011cf8e4c0
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
new file mode 100644
index 000000000000..30f4188d552e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( 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_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) dev-ruby/racc[ruby_targets_ruby19] ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) dev-ruby/racc[ruby_targets_ruby20] ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/test-unit-rr[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/test-unit-rr[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) 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=Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package
+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=~amd64 ~arm ~hppa ~ia64
+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	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=c39279ec5f7dc0c67d75a5a18ecc0954
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.3.4 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.3.4
new file mode 100644
index 000000000000..db2d89b1e5ba
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_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=ruby shadow bindings
+EAPI=5
+HOMEPAGE=https://github.com/apalmblad/ruby-shadow http://ttsky.net
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_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/ruby-shadow-2.3.4.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=a53394c84a649acba0121240e6f5287f
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.2.2-r1 b/metadata/md5-cache/dev-ruby/sprockets-2.2.2-r1
index 58ca7c7b53d8..622254b39d83 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.2.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby/hike-1.2[ruby_targets_ruby19] =dev-ruby/multi_json-1*[ruby_targets_ruby19] =dev-ruby/rack-1*[ruby_targets_ruby19] =dev-ruby/tilt-1*[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/rack-test[ruby_targets_ruby19] =dev-ruby/coffee-script-2*[ruby_targets_ruby19] =dev-ruby/execjs-1*[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] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby/hike-1.2[ruby_targets_ruby19] =dev-ruby/multi_json-1*[ruby_targets_ruby19] =dev-ruby/rack-1*[ruby_targets_ruby19] =dev-ruby/tilt-1*[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/hike-1*[ruby_targets_ruby20] >=dev-ruby/hike-1.2[ruby_targets_ruby20] =dev-ruby/multi_json-1*[ruby_targets_ruby20] =dev-ruby/rack-1*[ruby_targets_ruby20] =dev-ruby/tilt-1*[ruby_targets_ruby20] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/rack-test[ruby_targets_ruby19] =dev-ruby/coffee-script-2*[ruby_targets_ruby19] =dev-ruby/execjs-1*[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] =dev-ruby/coffee-script-2*[ruby_targets_ruby20] =dev-ruby/execjs-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=Ruby library for compiling and serving web assets.
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/sstephenson/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~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/hike-1*[ruby_targets_ruby19] >=dev-ruby/hike-1.2[ruby_targets_ruby19] =dev-ruby/multi_json-1*[ruby_targets_ruby19] =dev-ruby/rack-1*[ruby_targets_ruby19] =dev-ruby/tilt-1*[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby/hike-1.2[ruby_targets_ruby19] =dev-ruby/multi_json-1*[ruby_targets_ruby19] =dev-ruby/rack-1*[ruby_targets_ruby19] =dev-ruby/tilt-1*[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/hike-1*[ruby_targets_ruby20] >=dev-ruby/hike-1.2[ruby_targets_ruby20] =dev-ruby/multi_json-1*[ruby_targets_ruby20] =dev-ruby/rack-1*[ruby_targets_ruby20] =dev-ruby/tilt-1*[ruby_targets_ruby20] >=dev-ruby/tilt-1.3.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=2.2
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.2.2.tar.gz -> sprockets-2.2.2-git.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e1fd38ca2d0076fd15bc81a59a4d6a36
+_md5_=ffd17f1fee321ab46c69cd122cdcdcdf
diff --git a/metadata/md5-cache/dev-ruby/termcolor-1.2.2 b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
new file mode 100644
index 000000000000..86beb0cec6e5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=a library for ANSI color formatting like HTML for output in terminal
+EAPI=5
+HOMEPAGE=http://termcolor.rubyforge.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/termcolor-1.2.2.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8885058456425c7d8033f256af6f0b6b
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
new file mode 100644
index 000000000000..bfba1b4ee200
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( 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] ) 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=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=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=d8eece724a134ff0956fe44a49ed083d
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.1.3-r1 b/metadata/md5-cache/dev-ruby/thread_safe-0.1.3-r1
deleted file mode 100644
index f6bcc7fba69d..000000000000
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/atomic[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/atomic[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=A collection of thread-safe versions of common core Ruby classes
-EAPI=5
-HOMEPAGE=https://github.com/headius/thread_safe
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/atomic[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/atomic[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/thread_safe-0.1.3.gem
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=aaa31c5c9679ab69e190763839e35ff1
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.1.3-r2 b/metadata/md5-cache/dev-ruby/thread_safe-0.1.3-r2
deleted file mode 100644
index e81c9ca0ee4f..000000000000
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/atomic[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/atomic[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/atomic[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=A collection of thread-safe versions of common core Ruby classes
-EAPI=5
-HOMEPAGE=https://github.com/headius/thread_safe
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/atomic[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/atomic[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/atomic[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/thread_safe-0.1.3.gem
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=58c1eaa38db790d80cd3e19476b653ea
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.2.0 b/metadata/md5-cache/dev-ruby/thread_safe-0.2.0
deleted file mode 100644
index 56affedaf66d..000000000000
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/atomic-1.1.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/atomic-1.1.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/atomic-1.1.7[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=A collection of thread-safe versions of common core Ruby classes
-EAPI=5
-HOMEPAGE=https://github.com/headius/thread_safe
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/atomic-1.1.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/atomic-1.1.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/atomic-1.1.7[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/thread_safe-0.2.0.gem
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c167e174bd8962a387d978fb8c941e0d
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.1 b/metadata/md5-cache/dev-ruby/timecop-0.7.1
new file mode 100644
index 000000000000..1d3e66dfbc49
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/timecop-0.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
+EAPI=5
+HOMEPAGE=http://github.com/jtrupiano/timecop
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~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/timecop-0.7.1.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8079136d0cff2ead1befd45fa672db8a
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-2.2.2 b/metadata/md5-cache/dev-ruby/turbolinks-2.2.2
new file mode 100644
index 000000000000..fb39c1cf5e4c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/turbolinks-2.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/coffee-rails[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/coffee-rails[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/coffee-rails[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/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_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=Makes following links in your web application faster
+EAPI=5
+HOMEPAGE=https://github.com/dkubb/equalizer
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-rails[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/coffee-rails[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/coffee-rails[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/turbolinks-2.2.2.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=f2fefc3eaa47a9043e81cbd8e8fdee3f
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2
new file mode 100644
index 000000000000..c65ea741772a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2
@@ -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] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/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_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=Unicode Normalization Form support library for CRuby
+EAPI=5
+HOMEPAGE=http://sourceforge.jp/projects/unf/
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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=mirror://rubygems/unf_ext-0.0.6.gem
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=e5290f93dc1fbde67ff612bd48c72aac
diff --git a/metadata/md5-cache/dev-util/anjuta-3.10.2 b/metadata/md5-cache/dev-util/anjuta-3.10.2
index dd5b85668637..e00295b6ad63 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.10.2
+++ b/metadata/md5-cache/dev-util/anjuta-3.10.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.6:3 >=dev
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.10/anjuta-3.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5f1f9ab8bf1f5987e13954b2f9077434
diff --git a/metadata/md5-cache/dev-util/anjuta-3.12.0 b/metadata/md5-cache/dev-util/anjuta-3.12.0
index d7e5cb5f1dbe..5c3fef0343e1 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.12.0
+++ b/metadata/md5-cache/dev-util/anjuta-3.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.6:3 >=dev
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.12/anjuta-3.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=adc2e3cd520e805f1d8973e11bc2b657
diff --git a/metadata/md5-cache/dev-util/appdata-tools-0.1.7 b/metadata/md5-cache/dev-util/appdata-tools-0.1.7
index 20eb9b37b512..1a5458037ae7 100644
--- a/metadata/md5-cache/dev-util/appdata-tools-0.1.7
+++ b/metadata/md5-cache/dev-util/appdata-tools-0.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=CLI designed to validate AppData descriptions for standards complian
 EAPI=5
 HOMEPAGE=https://github.com/hughsie/appdata-tools/
 IUSE=nls
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.14 >=net-libs/libsoup-2.4 >=x11-libs/gdk-pixbuf-2.0
 SLOT=0
 SRC_URI=https://github.com/hughsie/appdata-tools/archive/appdata_tools_0_1_7.tar.gz -> appdata-tools-0.1.7.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=851fca56980e19d6dd036b6ff161ab90
+_md5_=6194ec7f498e130a5eaf44f3ff527ea8
diff --git a/metadata/md5-cache/dev-util/colm-0.12.0 b/metadata/md5-cache/dev-util/colm-0.12.0
new file mode 100644
index 000000000000..f35f536e094f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/colm-0.12.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=COmputer Language Manipulation
+EAPI=5
+HOMEPAGE=http://www.complang.org/colm/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.complang.org/colm/colm-0.12.0.tar.gz
+_md5_=6e46ce8e5f2281b518d13b0700e734b0
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.23 b/metadata/md5-cache/dev-util/geany-plugins-1.23
index 36119ee4141d..aa788d74ecb1 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.23
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.23
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=A collection of different plugins for Geany
 EAPI=5
 HOMEPAGE=http://plugins.geany.org/geany-plugins
 IUSE=+commander debugger devhelp enchant gpg gtkspell lua markdown multiterm nls scope soup webkit
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
+RDEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
 SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.23.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3bf309d79ae51699069188d2ea2d0b48
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.24-r1 b/metadata/md5-cache/dev-util/geany-plugins-1.24-r1
index 639a80c7b365..1ea3860769f3 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.24-r1
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.24-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/geany-1.24 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=>=dev-util/geany-1.24 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=A collection of different plugins for Geany
 EAPI=5
 HOMEPAGE=http://plugins.geany.org/geany-plugins
 IUSE=+autoclose +commander debugger +defineformat devhelp enchant gpg gtkspell lua markdown multiterm nls python scope soup webkit python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-util/geany-1.24 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
+RDEPEND=>=dev-util/geany-1.24 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
 REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.24.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=03f98f7e6e0a0ecccf7abc095d8b6cd6
diff --git a/metadata/md5-cache/dev-util/gtk-doc-am-1.20 b/metadata/md5-cache/dev-util/gtk-doc-am-1.20
index 6045507bc1e7..9eb1ae0bd0d8 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-am-1.20
+++ b/metadata/md5-cache/dev-util/gtk-doc-am-1.20
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/perl-5.6 !<dev-util/gtk-doc-1.20 app-arch/xz-utils
 DESCRIPTION=Automake files from gtk-doc
 EAPI=5
 HOMEPAGE=http://www.gtk.org/gtk-doc/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 FDL-1.1
 PDEPEND=virtual/pkgconfig
 RDEPEND=>=dev-lang/perl-5.6
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.20/gtk-doc-1.20.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=be73c63afd2417384d111d6e706c818c
+_md5_=97a0577fe4ea1896f22dcca2f7871dbf
diff --git a/metadata/md5-cache/dev-vcs/fossil-20130911114349 b/metadata/md5-cache/dev-vcs/fossil-20130911114349
index 322dd6dc6f7f..fc58c6a77e3f 100644
--- a/metadata/md5-cache/dev-vcs/fossil-20130911114349
+++ b/metadata/md5-cache/dev-vcs/fossil-20130911114349
@@ -4,10 +4,10 @@ DESCRIPTION=Simple, high-reliability, source control management, and more
 EAPI=5
 HOMEPAGE=http://www.fossil-scm.org/
 IUSE=json +lineedit sqlite +ssl tcl
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib lineedit? ( || ( sys-libs/readline:0= dev-libs/libedit ) ) ssl? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl )
 SLOT=0
 SRC_URI=http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d9b19be8d4b76be3d20601397140267b
+_md5_=cf122035ed6b423a973eedc5a01e0537
diff --git a/metadata/md5-cache/dev-vcs/gitg-0.3.2 b/metadata/md5-cache/dev-vcs/gitg-0.3.2
index 9016163e9fd2..1d32d0f4795e 100644
--- a/metadata/md5-cache/dev-vcs/gitg-0.3.2
+++ b/metadata/md5-cache/dev-vcs/gitg-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.10.1 dev-libs/libgit2[threads] >=dev-libs/libgit2-glib-0.0.10 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:3[introspection] >=x11-libs/gtk+-3.10.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( 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_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-libs/libpeas[python,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.10.1 dev-libs/libgit2[threads] >=dev-libs/libgit2-glib-0.0.10 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:3[introspection] >=x11-libs/gtk+-3.10.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( 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_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-libs/libpeas[python,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=git repository viewer for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/
 REQUIRED_USE=python? ( || ( python_targets_python3_2 python_targets_python3_3 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gitg/0.3/gitg-0.3.2.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=82fd2baeaa078310d5b90e1fabe65044
diff --git a/metadata/md5-cache/games-action/phobiaii-1.1 b/metadata/md5-cache/games-action/phobiaii-1.1
index 28bdb65b3793..608b461da549 100644
--- a/metadata/md5-cache/games-action/phobiaii-1.1
+++ b/metadata/md5-cache/games-action/phobiaii-1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst preinst setup unpack
 DESCRIPTION=Just a moment ago, you were safe inside your ship, behind five inch armour
 HOMEPAGE=http://www.lynxlabs.com/games/linuxphobia/index.html
 KEYWORDS=amd64 x86
-LICENSE=as-is
+LICENSE=freedist
 RDEPEND=media-libs/sdl-mixer media-libs/libsdl x86? ( sys-libs/lib-compat ) amd64? ( app-emulation/emul-linux-x86-compat ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.lynxlabs.com/games/linuxphobia/linuxphobia-1.1-i386.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=653866114101180c7e8d46d3e6e6e5b8
+_md5_=ce333d531b82c9f3a33c8c9fef41de9d
diff --git a/metadata/md5-cache/games-arcade/digger-20020314 b/metadata/md5-cache/games-arcade/digger-20020314
index 3400250c6560..8e327aba26c8 100644
--- a/metadata/md5-cache/games-arcade/digger-20020314
+++ b/metadata/md5-cache/games-arcade/digger-20020314
@@ -4,9 +4,10 @@ DESCRIPTION=Digger Remastered
 EAPI=2
 HOMEPAGE=http://www.digger.org/
 KEYWORDS=~amd64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=media-libs/libsdl[video] games-misc/games-envd
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.digger.org/digger-20020314.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=68d32d78bd7d5f297cb7bd8787a2ba44
+_md5_=64914c2e4522f90baaadff41058f9a71
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.10.3 b/metadata/md5-cache/games-board/gnome-chess-3.10.3
index 22ccfbded682..846feeb2f453 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.10.3
+++ b/metadata/md5-cache/games-board/gnome-chess-3.10.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 virtual/glu virtual/opengl >=x11-libs/gtk+-3.4:3 x11-libs/libX11 || ( dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 virtual/glu virtual/opengl >=x11-libs/gtk+-3.4:3 x11-libs/libX11 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Play the classic two-player boardgame of chess
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Chess
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 virtual/glu virtual/opengl >=x11-libs/gtk+-3.4:3 x11-libs/libX11 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.10/gnome-chess-3.10.3.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ab513c156195929ecfe0179c3b8d4bf7
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.12.1 b/metadata/md5-cache/games-board/gnome-chess-3.12.1
index 5ce86ac01c24..797f5500b0b5 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.12.1
+++ b/metadata/md5-cache/games-board/gnome-chess-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 virtual/glu virtual/opengl >=x11-libs/gtk+-3.10:3 x11-libs/libX11 || ( dev-lang/vala:0.22 dev-lang/vala:0.24 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 virtual/glu virtual/opengl >=x11-libs/gtk+-3.10:3 x11-libs/libX11 || ( dev-lang/vala:0.24 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Play the classic two-player boardgame of chess
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Chess
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 virtual/glu virtual/opengl >=x11-libs/gtk+-3.10:3 x11-libs/libX11 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.12/gnome-chess-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9eccd0309e8d66feaa371c069e2fa9d9
diff --git a/metadata/md5-cache/games-board/gnome-mahjongg-3.10.2 b/metadata/md5-cache/games-board/gnome-mahjongg-3.10.2
index 3bfe57dbc158..09076f81da40 100644
--- a/metadata/md5-cache/games-board/gnome-mahjongg-3.10.2
+++ b/metadata/md5-cache/games-board/gnome-mahjongg-3.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Disassemble a pile of tiles by removing matching pairs
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Mahjongg
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mahjongg/3.10/gnome-mahjongg-3.10.2.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=337aff8c08814bd09f0d836c28e8525e
diff --git a/metadata/md5-cache/games-board/gnome-mahjongg-3.12.1 b/metadata/md5-cache/games-board/gnome-mahjongg-3.12.1
index 7abd134b7aa4..cad94413d73d 100644
--- a/metadata/md5-cache/games-board/gnome-mahjongg-3.12.1
+++ b/metadata/md5-cache/games-board/gnome-mahjongg-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.50 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.50 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Disassemble a pile of tiles by removing matching pairs
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Mahjongg
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mahjongg/3.12/gnome-mahjongg-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=402f223d6911797b64d82defb5b22377
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.10.1 b/metadata/md5-cache/games-board/gnome-mines-3.10.1
index 29125960f04a..487d522aa6c3 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.10.1
+++ b/metadata/md5-cache/games-board/gnome-mines-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Clear hidden mines from a minefield
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Mines
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.10/gnome-mines-3.10.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2748fc2b07c0b8677ec24e3f0b454e96
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.12.1 b/metadata/md5-cache/games-board/gnome-mines-3.12.1
index f4a80b304815..58da41b5c532 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.12.1
+++ b/metadata/md5-cache/games-board/gnome-mines-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Clear hidden mines from a minefield
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Mines
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.12/gnome-mines-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2b1c24cb1296c4c972e9aab6e9cad5dd
diff --git a/metadata/md5-cache/games-board/iagno-3.10.1 b/metadata/md5-cache/games-board/iagno-3.10.1
index 989aa6146371..e9a8a8165acd 100644
--- a/metadata/md5-cache/games-board/iagno-3.10.1
+++ b/metadata/md5-cache/games-board/iagno-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Dominate the board in a classic version of Reversi
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Iagno
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/iagno/3.10/iagno-3.10.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a52e5801651220c2485d25240c7beac5
diff --git a/metadata/md5-cache/games-board/iagno-3.12.1 b/metadata/md5-cache/games-board/iagno-3.12.1
index 6aa398a68d10..2e1ca1773ee6 100644
--- a/metadata/md5-cache/games-board/iagno-3.12.1
+++ b/metadata/md5-cache/games-board/iagno-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Dominate the board in a classic version of Reversi
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Iagno
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/iagno/3.12/iagno-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3cfd3c251c518e9d19a3c1dcde2afa12
diff --git a/metadata/md5-cache/games-emulation/xe-2.16.2 b/metadata/md5-cache/games-emulation/xe-2.16.2
index 5a495414027f..78d2b2ed7afc 100644
--- a/metadata/md5-cache/games-emulation/xe-2.16.2
+++ b/metadata/md5-cache/games-emulation/xe-2.16.2
@@ -4,10 +4,10 @@ DESCRIPTION=a multi system emulator for many console and handheld video game sys
 EAPI=4
 HOMEPAGE=http://www.xe-emulator.com/
 KEYWORDS=-* amd64 x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=x11-libs/libXv x11-libs/libXinerama x11-libs/libXxf86vm sys-libs/zlib media-libs/alsa-lib x11-libs/gtk+:2 games-misc/games-envd
-RESTRICT=strip
+RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=amd64? ( http://www.xe-emulator.com/files/xe-x86-64-bin.2.16.2.tar.bz2 ) x86? ( http://www.xe-emulator.com/files/xe-x86-32-bin.2.16.2.tar.bz2 )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=941054fd566a2fa571e6fd07242197f3
+_md5_=5169182eb582b7a20deaa63d71404676
diff --git a/metadata/md5-cache/games-fps/eduke32-20131119.4169 b/metadata/md5-cache/games-fps/eduke32-20131119.4169
index e60773edcbf5..9537f58cf1c5 100644
--- a/metadata/md5-cache/games-fps/eduke32-20131119.4169
+++ b/metadata/md5-cache/games-fps/eduke32-20131119.4169
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( opl-musicpack sc55-musicpack )
 SLOT=0
 SRC_URI=http://dukeworld.duke4.net/eduke32/synthesis/20131119-4169/eduke32_src_20131119-4169.tar.xz http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar textures? ( http://www.duke4.org/files/nightfright/duke3d_hrp.zip -> duke3d_hrp_5.2.zip ) sc55-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_mus.zip -> duke3d_mus_3.0.zip ) opl-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_musopl.zip -> duke3d_musopl_2.0.zip ) offensive? ( http://www.duke4.org/files/nightfright/duke3d_xxx.zip -> duke3d_xxx_1.33.zip )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c37052d476d8d6ef09abf21e4ec1264d
+_md5_=ea22f5b4881f1694dbcab388fe3e27e7
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.10.0 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.10.0
index 56eaa8060172..86f2da00e674 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.10.0
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Slide blocks to solve the puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Klotski
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.10/gnome-klotski-3.10.0.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=10964e18c2577f62ee10a58797ae1605
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.1 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.1
index 8b4373f7d339..4e08e7967c4d 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.1
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Slide blocks to solve the puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Klotski
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.12/gnome-klotski-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c8ae45218ffa7a01e246b14b56a7fb49
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.10.1 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.10.1
index f8e7c5f9511e..eee5fac46f73 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.10.1
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Complete the puzzle by matching numbered tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Tetravex
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.10/gnome-tetravex-3.10.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4e04ea1dcf6b3fb6d936791dbc9d6178
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.1 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.1
index 740ad57d3d16..4bd258e16652 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.1
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Complete the puzzle by matching numbered tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Tetravex
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.12/gnome-tetravex-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3661f7423f4c64a065dfe9b101ccc45d
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.10.1 b/metadata/md5-cache/games-puzzle/lightsoff-3.10.1
index a9ab72c86f54..85190e4b8be7 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.10.1
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Turn off all the lights
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Lightsoff
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.10/lightsoff-3.10.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8ca178c8342d67697c519321259ec649
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.12.1 b/metadata/md5-cache/games-puzzle/lightsoff-3.12.1
index 8b64ecf5df17..563ce5909395 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.12.1
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Turn off all the lights
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Lightsoff
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.12/lightsoff-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c97c10de3c04ee0e0507ef9e90542899
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.10.2 b/metadata/md5-cache/games-puzzle/quadrapassel-3.10.2
index 61931b68f0d0..099496ff0989 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.10.2
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Fit falling blocks together
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Quadrapassel
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.10/quadrapassel-3.10.2.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1827e64325fbdb78a01b3998375a5a01
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.12.1 b/metadata/md5-cache/games-puzzle/quadrapassel-3.12.1
index 6a88dacd6960..a55aa9bdc50c 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.12.1
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Fit falling blocks together
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Quadrapassel
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.12/quadrapassel-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a76965fe6c4b283d280c6cff294b9f3b
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.10.1 b/metadata/md5-cache/games-puzzle/swell-foop-3.10.1
index 6acc15bba5a8..73699cd57fcb 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.10.1
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Swell%20Foop
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.10/swell-foop-3.10.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9d3dd9e14012a86ca086d95443a0fc0a
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.12.1 b/metadata/md5-cache/games-puzzle/swell-foop-3.12.1
index 5808f6a4f9a3..28832241be7d 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.12.1
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Swell%20Foop
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.12/swell-foop-3.12.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	016d5de1968de77e56a90938ed6e5aba	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=633ee9ed2262d8847c5f3a15d7e140f3
diff --git a/metadata/md5-cache/games-strategy/heroes3-demo-1.3.1a b/metadata/md5-cache/games-strategy/heroes3-demo-1.3.1a
index 74fd2da57b7d..c980f722900e 100644
--- a/metadata/md5-cache/games-strategy/heroes3-demo-1.3.1a
+++ b/metadata/md5-cache/games-strategy/heroes3-demo-1.3.1a
@@ -3,10 +3,10 @@ DEPEND=games-util/loki_patch
 DESCRIPTION=turn-based 2D medieval combat
 HOMEPAGE=http://www.lokigames.com/products/heroes3/
 KEYWORDS=~amd64 x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=>=sys-libs/lib-compat-loki-0.2 x86? ( x11-libs/libX11 ) ppc? ( x11-libs/libX11 ) amd64? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-compat ) games-misc/games-envd
-RESTRICT=strip
+RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/heroes3-demo.run
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fc9f64e429364f17fdbb28f5272299f1
+_md5_=3010c9cad1e8634ed6fe9493601220f1
diff --git a/metadata/md5-cache/games-strategy/uqm-0.7.0-r2 b/metadata/md5-cache/games-strategy/uqm-0.7.0-r2
index 6e81dcf9cc8c..79b6bdd3695f 100644
--- a/metadata/md5-cache/games-strategy/uqm-0.7.0-r2
+++ b/metadata/md5-cache/games-strategy/uqm-0.7.0-r2
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4 media-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/sc2/uqm-0.7.0-source.tgz mirror://sourceforge/sc2/uqm-0.7.0-content.uqm music? ( mirror://sourceforge/sc2/uqm-0.7.0-3domusic.uqm ) voice? ( mirror://sourceforge/sc2/uqm-0.7.0-voice.uqm ) remix? ( mirror://sourceforge/sc2/uqm-remix-disc1.uqm mirror://sourceforge/sc2/uqm-remix-disc2.uqm mirror://sourceforge/sc2/uqm-remix-disc3.uqm )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bcf70f09c29b5a825c8192cc620cc2cf
+_md5_=5f469b44babb5a9e155f331a6f1b0113
diff --git a/metadata/md5-cache/gnome-base/gconf-3.2.6-r2 b/metadata/md5-cache/gnome-base/gconf-3.2.6-r2
index 4d92d55234cb..f334f57124d6 100644
--- a/metadata/md5-cache/gnome-base/gconf-3.2.6-r2
+++ b/metadata/md5-cache/gnome-base/gconf-3.2.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME configuration system and daemon
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/gconf/
 IUSE=debug +introspection ldap policykit debug python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-libs/glib-2.31:2 >=dev-libs/dbus-glib-0.74:= >=sys-apps/dbus-1:= >=dev-libs/libxml2-2:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ldap? ( net-nds/openldap:= ) policykit? ( sys-auth/polkit:= )
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=87930fd8a5613a8349fd06831afee7bb
+_md5_=42f99d6eec201b65e73383794acd1a27
diff --git a/metadata/md5-cache/gnome-base/gdm-3.10.0.1-r1 b/metadata/md5-cache/gnome-base/gdm-3.10.0.1-r1
index 6cfc78cf912a..3df9cad9ee12 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.10.0.1-r1
+++ b/metadata/md5-cache/gnome-base/gdm-3.10.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME Display Manager for managing graphical display servers and use
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/GDM
 IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test xinerama debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=GPL-2+ branding? ( CC-Sampling-Plus-1.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2 >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam systemd? ( >=sys-apps/systemd-186:0=[pam] ) !systemd? ( >=x11-base/xorg-server-1.14.3-r1 >=sys-auth/consolekit-0.4.5_p20120320-r2 !<sys-apps/openrc-0.12 ) sys-auth/pambase[systemd?] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 gnome-extra/polkit-gnome:0 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( >=app-accessibility/orca-3.10 app-accessibility/caribou gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.10/gdm-3.10.0.1.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) http://dev.gentoo.org/~pacho/gnome/gdm-3.10.0.1-patches.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e13bdfcc557d5bc61f5976f008b948c2
+_md5_=587abbfb98418c72c8731cf51be3083c
diff --git a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.10.0-r1 b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.10.0-r1
index e75ef87a5496..0d82247cb93e 100644
--- a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.10.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.10.0-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Sub-meta package for the applications of GNOME 3
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
 IUSE=+games +shotwell +tracker
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=metapackage
 RDEPEND=>=gnome-base/gnome-core-libs-3.10.0 >=app-admin/gnome-system-log-3.9.90 >=app-arch/file-roller-3.10.0 >=app-dicts/gnome-dictionary-3.10.0 >=gnome-extra/gconf-editor-3 >=gnome-extra/gnome-calculator-3.10.0 >=gnome-extra/gnome-power-manager-3.10.0 >=gnome-extra/gnome-search-tool-3.6 >=gnome-extra/gnome-system-monitor-3.10.0 >=gnome-extra/gnome-tweak-tool-3.10.0 >=gnome-extra/gucharmap-3.10.0:2.90 >=gnome-extra/nautilus-sendto-3.8 >=gnome-extra/sushi-3.10.0 >=mail-client/evolution-3.10.0 >=media-gfx/gnome-font-viewer-3.10.0 >=media-gfx/gnome-screenshot-3.10.0 >=media-sound/sound-juicer-3.5.0 >=media-video/cheese-3.10.0 >=net-analyzer/gnome-nettool-3.8 >=net-misc/vinagre-3.10.0 >=net-misc/vino-3.10.0 >=sys-apps/baobab-3.10.0 >=www-client/epiphany-3.10.0 games? ( >=games-arcade/gnome-nibbles-3.10.0 >=games-arcade/gnome-robots-3.10.0 >=games-board/aisleriot-3.2.3.2 >=games-board/four-in-a-row-3.10.0 >=games-board/gnome-chess-3.10.0 >=games-board/gnome-mahjongg-3.10.0 >=games-board/gnome-mines-3.10.0 >=games-board/iagno-3.10.0 >=games-board/tali-3.10.0 >=games-puzzle/five-or-more-3.10.0 >=games-puzzle/gnome-klotski-3.10.0 >=games-puzzle/gnome-sudoku-3.10.0 >=games-puzzle/gnome-tetravex-3.10.0 >=games-puzzle/lightsoff-3.10.0 >=games-puzzle/quadrapassel-3.10.0 >=games-puzzle/swell-foop-3.10.0 ) shotwell? ( >=media-gfx/shotwell-0.15 ) tracker? ( >=app-misc/tracker-0.16 >=gnome-extra/gnome-documents-3.10.0 ) amd64? ( >=gnome-extra/gnome-user-share-3.10.0 ) x86? ( >=gnome-extra/gnome-user-share-3.10.0 )
 SLOT=3.0
-_md5_=2ffa32e2ec10acecb88357140d324071
+_md5_=1759e5a7448c84c94df93b5505a043bc
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.10.4-r2 b/metadata/md5-cache/gnome-base/gnome-shell-3.10.4-r2
index d443733daaef..f5997dc6c16d 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.10.4-r2
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.10.4-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +i18n +networkmanager -openrc-force python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-crypt/libsecret >=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.37:2 >=dev-libs/gjs-1.38.1 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.7.9:3[introspection] >=media-libs/clutter-1.13.4:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.7.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.10.4[introspection] >=x11-libs/startup-notification-0.11 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-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.9.8[introspection] ) >=sys-auth/polkit-0.101[introspection] >=app-accessibility/caribou-0.4.8 >=gnome-base/gdm-3.5[introspection] media-libs/cogl[introspection] >=sys-apps/accountsservice-0.6.14[introspection] sys-power/upower[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?] !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic i18n? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.10/gnome-shell-3.10.4.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c919c2346a8b7e072a0b3d9962268bb5
+_md5_=17b337f8d47e5d9e12b75eed23fcd4e9
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.18.3-r1 b/metadata/md5-cache/gnome-base/gvfs-1.18.3-r1
index 07a1f3adb882..6814fc44c7af 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.18.3-r1
+++ b/metadata/md5-cache/gnome-base/gvfs-1.18.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual filesystem implementation for gio
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gvfs
 IUSE=afp archive avahi bluetooth bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.37:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) avahi? ( >=net-dns/avahi-0.6 ) bluetooth? ( >=app-mobilephone/obex-data-server-0.4.5 dev-libs/dbus-glib net-wireless/bluez dev-libs/expat ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-gnome-2.34:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) libsecret? ( app-crypt/libsecret ) mtp? ( >=media-libs/libmtp-1.1.6 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) virtual/udev[gudev] ) udisks? ( >=sys-fs/udisks-1.97:2 )
 REQUIRED_USE=cdda? ( udev ) udisks? ( udev ) systemd? ( udisks )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.18/gvfs-1.18.3.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e114841e79d398c898ed82d90b4d7402
+_md5_=57b1ee2fb66869ff24f56780970988ed
diff --git a/metadata/md5-cache/gnome-base/libglade-2.6.4-r1 b/metadata/md5-cache/gnome-base/libglade-2.6.4-r1
index 66e6ceca98e4..6aaf11a42c7e 100644
--- a/metadata/md5-cache/gnome-base/libglade-2.6.4-r1
+++ b/metadata/md5-cache/gnome-base/libglade-2.6.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library to construct graphical interfaces at runtime
 EAPI=5
 HOMEPAGE=http://library.gnome.org/devel/libglade/stable/
 IUSE=doc static-libs test python_targets_python2_7 python_targets_pypy python_single_target_python2_7 python_single_target_pypy test
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.8.10:2 >=dev-libs/atk-1.9 >=dev-libs/libxml2-2.4.10 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_single_target_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_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) ^^ ( python_single_target_python2_7 python_single_target_pypy )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ced0288f35e4bd8dd58b693e856f260a
+_md5_=8a527e98ae713a00434c362bdf32fa1a
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.10.1 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.10.1
index 624446b84418..583045d494e1 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.10.1
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Compatibility library for accessing secrets
 EAPI=5
 HOMEPAGE=http://live.gnome.org/GnomeKeyring
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=d
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/3.10/libgnome-keyring-3.10.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2f72d3e59f283db8f6c81997ed9dfc44
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
index 0998f21718e1..b4c022c81e33 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Compatibility library for accessing secrets
 EAPI=5
 HOMEPAGE=http://live.gnome.org/GnomeKeyring
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=d
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/3.12/libgnome-keyring-3.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6304bf28448283efea882298e435e4e8
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.1-r1 b/metadata/md5-cache/gnome-base/librsvg-2.40.1-r1
index b84b3a24a2d3..547e32674e39 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.1-r1
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.32.6 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 >=x11-libs/gdk-pixbuf-2.20:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.32.6 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 >=x11-libs/gdk-pixbuf-2.20:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.32.6 >=de
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bb971f5a02aa1b2b69dcd98d4b51d8e6
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.2 b/metadata/md5-cache/gnome-base/librsvg-2.40.2
index abd0e68f3b70..1e5466f1ccff 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.2
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.32.6 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 >=x11-libs/gdk-pixbuf-2.20:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.32.6 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 >=x11-libs/gdk-pixbuf-2.20:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
 IUSE=+introspection vala tools
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.32.6 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 >=x11-libs/gdk-pixbuf-2.20:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.2.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7ecd2550019ef8a1b817e0e1546fce2c
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=9329c6e0870f02e17f170917f6e9b0ff
diff --git a/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7 b/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7
index 4fccd3a1dba5..2d2b8aee1ea9 100644
--- a/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7
+++ b/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GUI which lets you easily control what gets logged by Zeitgeist
 EAPI=5
 HOMEPAGE=https://launchpad.net/activity-log-manager/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=http://launchpad.net/history-manager/0.9/0.9.7/+download/activity-log-manager-0.9.7.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5fac5917786f4ed504fa5456e9a0a1fb
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=fd6f18412d9040a6026de2f9291c0bb5
diff --git a/metadata/md5-cache/gnome-extra/avant-window-navigator-0.4.0 b/metadata/md5-cache/gnome-extra/avant-window-navigator-0.4.0
index cdb5a4aaed46..a2c1d7fd62bd 100644
--- a/metadata/md5-cache/gnome-extra/avant-window-navigator-0.4.0
+++ b/metadata/md5-cache/gnome-extra/avant-window-navigator-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.16 dev-python/dbus-python dev-python/librsvg-python dev-python/pycairo dev-python/pygobject:2 >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-vcs/bzr >=gnome-base/libgtop-2 >=x11-libs/gtk+-2.12:2 >=x11-libs/libdesktop-agnostic-0.3.9[gconf?] >=x11-libs/libwnck-2.22:1 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] gconf? ( >=gnome-base/gconf-2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<gnome-extra/avant-window-navigator-extras-0.4.0 doc? ( dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] dev-lang/vala:0.10[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.16 dev-python/dbus-python dev-python/librsvg-python dev-python/pycairo dev-python/pygobject:2 >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-vcs/bzr >=gnome-base/libgtop-2 >=x11-libs/gtk+-2.12:2 >=x11-libs/libdesktop-agnostic-0.3.9[gconf?] >=x11-libs/libwnck-2.22:1 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] gconf? ( >=gnome-base/gconf-2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<gnome-extra/avant-window-navigator-extras-0.4.0 doc? ( dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] dev-lang/vala:0.10[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A dock-like bar which sits at the bottom of the screen
 EAPI=5
 HOMEPAGE=http://launchpad.net/awn
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.16 dev-python/dbus-python dev-python/librsvg-python dev-python/pycairo dev-python/pygobject:2 >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-vcs/bzr >=gnome-base/libgtop-2 >=x11-libs/gtk+-2.12:2 >=x11-libs/libdesktop-agnostic-0.3.9[gconf?] >=x11-libs/libwnck-2.22:1 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] gconf? ( >=gnome-base/gconf-2 )
 SLOT=0
 SRC_URI=http://launchpad.net/awn/0.4/0.4.0/+download/avant-window-navigator-0.4.0.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=28aa0cbae8f16a76a667075c4073f626
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.10.4 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.10.4
index 40248939b208..39bccba37265 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.10.4
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.10.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.34:2 >=dev-db/sqlite-3.5:= >=dev-libs/libgdata-0.10:= >=app-crypt/libsecret-0.5[crypt] >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.40.3:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4:= >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=app-crypt/gcr-3.4 sys-libs/zlib:= virtual/libiconv gtk? ( >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/fix-la-relink-command dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.34:2 >=dev-db/sqlite-3.5:= >=dev-libs/libgdata-0.10:= >=app-crypt/libsecret-0.5[crypt] >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.40.3:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4:= >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=app-crypt/gcr-3.4 sys-libs/zlib:= virtual/libiconv gtk? ( >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/fix-la-relink-command dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Evolution groupware backend
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2 >=dev-db/sqlite-3.5:= >=dev-libs/libgdata-0.10:=
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/45
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.10/evolution-data-server-3.10.4.tar.xz
-_eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b3c093fc3508c37bb8283a6e1252fcb8
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.1
index 07cac845ad54..b0d9b0c0d449 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.1
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=sys-libs/db-4:= dev-libs/icu sys-libs/zlib:= virtual/libiconv gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=sys-libs/db-4:= dev-libs/icu sys-libs/zlib:= virtual/libiconv gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Evolution groupware backend
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/49
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.12/evolution-data-server-3.12.1.tar.xz
-_eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a07ec9cb87c914c96e0b32529010446f
diff --git a/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.1 b/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.1
deleted file mode 100644
index 8cbee638e830..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=mail-client/evolution-3.8.1:2.0 =gnome-extra/evolution-data-server-3.8* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Evolution module for connecting to Kolab groupware servers
-EAPI=5
-HOMEPAGE=https://live.gnome.org/Evolution/Kolab
-KEYWORDS=amd64
-LICENSE=LGPL-2.1
-RDEPEND=>=mail-client/evolution-3.8.1:2.0 =gnome-extra/evolution-data-server-3.8* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/evolution-kolab/3.8/evolution-kolab-3.8.1.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9de7fe0eb7ca83528f1f68bf7c07fbb4
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.10.2 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.10.2
index cbe5b61bf1ae..6fa22419bfcf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.10.2
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.10.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-0.9.6 >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.7 >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.1.7 >=x11-libs/gtk+-3.9:3 >=net-libs/gtk-vnc-0.4.4[gtk3] >=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?] >=app-misc/tracker-0.16:0=[iso] >=media-libs/clutter-gtk-1.3.2:1.0 >=media-libs/clutter-1.11.14:1.0 >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/fuse sys-fs/fuseiso sys-fs/mtools >=virtual/udev-165[gudev]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.10/gnome-boxes-3.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1230dd735f70b0b2129e0419bce82f1e
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.12.1 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.12.1
index f536f91ac8c5..8766d8ba0fbf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.12.1
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6 >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.9 >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.1.7 >=x11-libs/gtk+-3.11:3 >=net-libs/gtk-vnc-0.4.4[gtk3] >=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?] >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/fuse sys-fs/fuseiso sys-fs/mtools >=virtual/udev-165[gudev]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.12/gnome-boxes-3.12.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=853680fa54348787646ed861880b0ab3
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.10.1 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.10.1
index c8404274e0e3..7bdb1bacd551 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.10.1
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.9.11:3 >=media-libs/libcanberra-0.30 >=dev-libs/libgweather-3.9.91:= >=gnome-base/gnome-desktop-3.7.90:= >=sci-geosciences/geocode-glib-0.99.4 >=app-misc/geoclue-1.99.3:2.0 >=x11-libs/libnotify-0.7:= || ( dev-lang/vala:0.22 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.9.11:3 >=media-libs/libcanberra-0.30 >=dev-libs/libgweather-3.9.91:= >=gnome-base/gnome-desktop-3.7.90:= >=sci-geosciences/geocode-glib-0.99.4 >=app-misc/geoclue-1.99.3:2.0 >=x11-libs/libnotify-0.7:= || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Clocks application for GNOME
 EAPI=5
 HOMEPAGE=http://live.gnome.org/GnomeClocks
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.9.11:3 >=media-libs/libcanberra-0.30 >=dev-libs/libgweather-3.9.91:= >=gnome-base/gnome-desktop-3.7.90:= >=sci-geosciences/geocode-glib-0.99.4 >=app-misc/geoclue-1.99.3:2.0 >=x11-libs/libnotify-0.7:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.10/gnome-clocks-3.10.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3764839c686f5bf6f8853b53fbf5e845
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.12.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.12.0
index a62e10e6f635..3bb5e24324b8 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.12.0
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.39:2 >=x11-libs/gtk+-3.12:3 >=media-libs/libcanberra-0.30 >=dev-libs/libgweather-3.9.91:= >=gnome-base/gnome-desktop-3.7.90:= >=sci-geosciences/geocode-glib-0.99.4 >=app-misc/geoclue-1.99.3:2.0 || ( dev-lang/vala:0.22 dev-lang/vala:0.24 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.39:2 >=x11-libs/gtk+-3.12:3 >=media-libs/libcanberra-0.30 >=dev-libs/libgweather-3.9.91:= >=gnome-base/gnome-desktop-3.7.90:= >=sci-geosciences/geocode-glib-0.99.4 >=app-misc/geoclue-1.99.3:2.0 || ( dev-lang/vala:0.24 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Clocks application for GNOME
 EAPI=5
 HOMEPAGE=http://live.gnome.org/GnomeClocks
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39:2 >=x11-libs/gtk+-3.12:3 >=media-libs/libcanberra-0.30 >=dev-libs/libgweather-3.9.91:= >=gnome-base/gnome-desktop-3.7.90:= >=sci-geosciences/geocode-glib-0.99.4 >=app-misc/geoclue-1.99.3:2.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.12/gnome-clocks-3.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7296d44430eed23d40ebabfe1c7e4500
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.4.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.4.1
new file mode 100644
index 000000000000..f64950a4eb54
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.6.0:2 >=dev-libs/libunique-0.9.3:1 dev-util/meld gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) doc? ( app-text/scrollkeeper gnome-extra/yelp ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) pdf? ( >=app-text/poppler-0.18 ) python? ( >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=A full featured, twin-panel file manager for Gnome2
+EAPI=5
+HOMEPAGE=http://gcmd.github.io/
+IUSE=chm doc exif gsf pdf python taglib debug python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.6.0:2 >=dev-libs/libunique-0.9.3:1 dev-util/meld gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) doc? ( app-text/scrollkeeper gnome-extra/yelp ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) pdf? ( >=app-text/poppler-0.18 ) python? ( >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.4/gnome-commander-1.4.1.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=25b3f089a82c4cc1ce489b946d1f6cc8
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.10.1 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.10.1
index dd0ddcb375cb..71fd6a62bc44 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.10.1
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts >=net-libs/telepathy-glib-0.17.5 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libnotify:= >=x11-libs/gtk+-3.9.11:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.10/gnome-contacts-3.10.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a3cbfe34bc4437646ce39e7852175313
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=9c20c607ba849bcb55f513f6e87a49b8
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.12.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.12.0
index 1c6a434b3986..f8671ed77886 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.12.0
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts >=net-libs/telepathy-glib-0.17.5 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libnotify:= >=x11-libs/gtk+-3.12:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= ) || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.24[vapigen] ) >=dev-libs/gobject-introspection-0.9.6 dev-libs/folks[vala(+)] gnome-base/gnome-desktop[introspection] gnome-extra/evolution-data-server[vala] net-libs/telepathy-glib[vala] x11-libs/libnotify[introspection] dev-libs/libxslt >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts >=net-libs/telepathy-glib-0.17.5 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libnotify:= >=x11-libs/gtk+-3.12:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= ) || ( dev-lang/vala:0.24[vapigen] ) >=dev-libs/gobject-introspection-0.9.6 dev-libs/folks[vala(+)] gnome-base/gnome-desktop[introspection] gnome-extra/evolution-data-server[vala] net-libs/telepathy-glib[vala] x11-libs/libnotify[introspection] dev-libs/libxslt >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME contact management application
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts >=net-libs/telepathy-glib-0.17.5 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libnotify:= >=x11-libs/gtk+-3.12:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.12/gnome-contacts-3.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c8b389d1c641307ebf3c2f0e7c023b42
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.10.2 b/metadata/md5-cache/gnome-extra/gnome-documents-3.10.2
index 823c0865df5f..5a8f5d0bbfb9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.10.2
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.10.2
@@ -3,10 +3,10 @@ DEPEND=>=app-misc/tracker-0.16:= >=app-text/evince-3.7.4[introspection] dev-libs
 DESCRIPTION=A document manager application for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Documents
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/tracker-0.16:= >=app-text/evince-3.7.4[introspection] dev-libs/gjs >=dev-libs/glib-2.37:2 >=dev-libs/gobject-introspection-1.31.6 >=dev-libs/libgdata-0.13.3[gnome,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-1.10.0:3 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.9.11:3[introspection] x11-libs/pango[introspection] media-libs/clutter[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/gnome-icon-theme-symbolic
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.10/gnome-documents-3.10.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f8d8c6bd5b556b02d0b7ae9ac9c2a312
+_md5_=4762a008ef840c2042befa38b58b6c69
diff --git a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.10 b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.10
index 72301be55287..d9f0f3c4eb40 100644
--- a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.10
+++ b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-0.10.29:0.10 >=media-libs/gst-plugins-good-0.10.14:0.10 >=media-libs/gst-plugins-bad-0.10.13:0.10 >=dev-libs/libgee-0.5:0 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-0.10.7:0.10 media-plugins/gst-plugins-dvb:0.10 dev-python/gst-python:0.10 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-0.10.8 x11-libs/gtk+:3[introspection] virtual/udev[gudev] vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) ) totem? ( media-video/totem ) >=dev-lang/perl-5.8.1 >=dev-util/intltool-0.40.0 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.18.1 ) >=sys-devel/libtool-2.2.6 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-0.10.29:0.10 >=media-libs/gst-plugins-good-0.10.14:0.10 >=media-libs/gst-plugins-bad-0.10.13:0.10 >=dev-libs/libgee-0.5:0 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-0.10.7:0.10 media-plugins/gst-plugins-dvb:0.10 dev-python/gst-python:0.10 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-0.10.8 x11-libs/gtk+:3[introspection] virtual/udev[gudev] vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) ) totem? ( media-video/totem ) >=dev-lang/perl-5.8.1 >=dev-util/intltool-0.40.0 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.18.1 ) >=sys-devel/libtool-2.2.6 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer
 EAPI=4
 HOMEPAGE=https://live.gnome.org/DVBDaemon
 IUSE=nls totem vala
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-0.10.29:0.10 >=media-libs/gst-plugins-good-0.10.14:0.10 >=media-libs/gst-plugins-bad-0.10.13:0.10 >=dev-libs/libgee-0.5:0 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-0.10.7:0.10 media-plugins/gst-plugins-dvb:0.10 dev-python/gst-python:0.10 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-0.10.8 x11-libs/gtk+:3[introspection] virtual/udev[gudev] vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) ) totem? ( media-video/totem ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-0.10.29:0.10 >=media-libs/gst-plugins-good-0.10.14:0.10 >=media-libs/gst-plugins-bad-0.10.13:0.10 >=dev-libs/libgee-0.5:0 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-0.10.7:0.10 media-plugins/gst-plugins-dvb:0.10 dev-python/gst-python:0.10 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-0.10.8 x11-libs/gtk+:3[introspection] virtual/udev[gudev] vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) ) totem? ( media-video/totem ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dvb-daemon/0.2/gnome-dvb-daemon-0.2.10.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e757dd98f3262c1691379a1165f4014f
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-24 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-24
index 322f7b29daf0..a2f76767dc6d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-24
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-24
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Shows legacy tray icons on top
 EAPI=5
 HOMEPAGE=https://extensions.gnome.org/extension/495/topicons/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-admin/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.10
 SLOT=0
 SRC_URI=http://94.247.144.115/repo/topicons/snapshot/topicons-24.tar.xz
-_md5_=ead723c61d0c45ba151ef589f61236ca
+_md5_=e02e9f0adf40e217a8668dc4c949bd2f
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.10.2 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.10.2
index 8af54835e7cf..95dd949a8201 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-share-3.10.2
+++ b/metadata/md5-cache/gnome-extra/gnome-user-share-3.10.2
@@ -4,10 +4,10 @@ DESCRIPTION=Personal file sharing for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-user-share
 IUSE=bluetooth
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:= bluetooth? ( >=net-wireless/gnome-bluetooth-3.9.3:2 >=net-wireless/bluez-5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-share/3.10/gnome-user-share-3.10.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=33d5493cbc8d1c05446ecdc1a7ea41b0
+_md5_=2e96a19110a6a88f7f9fe9ef3aea4884
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-3.10.1 b/metadata/md5-cache/gnome-extra/gucharmap-3.10.1
index 71d8b935ed4b..e414690b9c7b 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-3.10.1
+++ b/metadata/md5-cache/gnome-extra/gucharmap-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Unicode character map viewer and library
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Gucharmap
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/3.10/gucharmap-3.10.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4b6a2c759debf2b580199f51b183efc2
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-3.12.0 b/metadata/md5-cache/gnome-extra/gucharmap-3.12.0
index 5c9699fb78de..7eb930aa0306 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-3.12.0
+++ b/metadata/md5-cache/gnome-extra/gucharmap-3.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Unicode character map viewer and library
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Gucharmap
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/3.12/gucharmap-3.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f9676b8b198e0aa02e1fd164add37a03
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.30 b/metadata/md5-cache/gnome-extra/libgsf-1.14.30
index a08a7fa4d746..52b10a2e3d7f 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.30
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.30
@@ -4,10 +4,10 @@ DESCRIPTION=The GNOME Structured File Library
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-1 )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.30.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=795a071b582c6e1158b4b2857ff36e90
+_md5_=5f603d2e2790251ae5d4c329d8d00046
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.10 b/metadata/md5-cache/gnome-extra/synapse-0.2.10
index 9e53df86c504..7c1d73b02dd9 100644
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.10
+++ b/metadata/md5-cache/gnome-extra/synapse-0.2.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) )
 SLOT=0
 SRC_URI=http://launchpad.net/synapse-project/0.2/0.2.10/+download/synapse-0.2.10.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bdff74f8d11ea92ce96027f2b2da05db
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12
index 027bb908fe78..2de80be09aa1 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !gnome-extra/zeitgeist-datahub dev-libs/json-glib dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 datahub? ( x11-libs/gtk+:3 ) extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !gnome-extra/zeitgeist-datahub dev-libs/json-glib dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 datahub? ( x11-libs/gtk+:3 ) extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Service to log activities and present to other apps
 EAPI=5
 HOMEPAGE=http://launchpad.net/zeitgeist/
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.12/+download/zeitgeist-0.9.12.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ae3979fe89a1bb726e32d2b0a1577452
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12-r1 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12-r1
index 350c95216c1a..1cb2d781e53a 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12-r1
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !gnome-extra/zeitgeist-datahub dev-libs/json-glib dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 datahub? ( x11-libs/gtk+:3 ) extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !gnome-extra/zeitgeist-datahub dev-libs/json-glib dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 datahub? ( x11-libs/gtk+:3 ) extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Service to log activities and present to other apps
 EAPI=5
 HOMEPAGE=http://launchpad.net/zeitgeist/
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.12/+download/zeitgeist-0.9.12.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=74a36bf66c919e36d878c2b10b60ea16
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14
index 906e144fa108..64192aba9fa9 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !gnome-extra/zeitgeist-datahub dev-libs/json-glib dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !gnome-extra/zeitgeist-datahub dev-libs/json-glib dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Service to log activities and present to other apps
 EAPI=5
 HOMEPAGE=http://launchpad.net/zeitgeist/
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.14/+download/zeitgeist-0.9.14.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b4199c1465210d8a81271eef02c52575
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.5-r1 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.5-r1
index 783f799c46bc..0a7f4fe25934 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.5-r1
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/xapian[inmemory] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/raptor:2 dev-libs/glib:2 dev-db/sqlite:3 extensions? ( gnome-extra/zeitgeist-extensions ) icu? ( dev-libs/dee[icu?] ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/xapian[inmemory] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/raptor:2 dev-libs/glib:2 dev-db/sqlite:3 extensions? ( gnome-extra/zeitgeist-extensions ) icu? ( dev-libs/dee[icu?] ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Service to log activities and present to other apps
 EAPI=5
 HOMEPAGE=http://launchpad.net/zeitgeist/
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.5/+download/zeitgeist-0.9.5.tar.bz2
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=678417afd0e5b8abf7b07e233a194cf3
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5 b/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
index 54ab7142c133..20a2c7954982 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!>=gnome-extra/zeitgeist-0.9.12 dev-libs/libzeitgeist >=dev-libs/json-glib-0.14.0 dev-libs/glib:2 x11-libs/gtk+:2 telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) virtual/pkgconfig
+DEPEND=!>=gnome-extra/zeitgeist-0.9.12 dev-libs/libzeitgeist >=dev-libs/json-glib-0.14.0 dev-libs/glib:2 x11-libs/gtk+:2 telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) virtual/pkgconfig
 DESCRIPTION=Provides passive plugins to insert events into zeitgeist
 EAPI=4
 HOMEPAGE=http://launchpad.net/zeitgeist-datahub
@@ -10,5 +10,5 @@ PDEPEND=gnome-extra/zeitgeist
 RDEPEND=!>=gnome-extra/zeitgeist-0.9.12 dev-libs/libzeitgeist >=dev-libs/json-glib-0.14.0 dev-libs/glib:2 x11-libs/gtk+:2 telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-datahub/0.9/0.9.5/+download/zeitgeist-datahub-0.9.5.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b03dfbabd6e13ac1999436cb8a35fb5d
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.1 b/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.1
index b0740f1a4017..1e3b458b688d 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.1
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libzeitgeist x11-libs/gtk+:2 emacs? ( virtual/emacs ) firefox? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) geany? ( dev-util/geany ) mono? ( dev-util/monodevelop ) telepathy? ( net-libs/telepathy-glib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pygobject[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) tomboy? ( app-misc/tomboy dev-dotnet/gtk-sharp dev-dotnet/mono-addins dev-dotnet/zeitgeist-sharp dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) vim? ( app-editors/vim[python] ) xchat? ( net-irc/xchat-gnome ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libzeitgeist x11-libs/gtk+:2 emacs? ( virtual/emacs ) firefox? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) geany? ( dev-util/geany ) mono? ( dev-util/monodevelop ) telepathy? ( net-libs/telepathy-glib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pygobject[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) tomboy? ( app-misc/tomboy dev-dotnet/gtk-sharp dev-dotnet/mono-addins dev-dotnet/zeitgeist-sharp dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) vim? ( app-editors/vim[python] ) xchat? ( net-irc/xchat-gnome ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Plugins whose work is to push activities as events into Zeitgeist daemon
 EAPI=5
 HOMEPAGE=https://launchpad.net/zeitgeist-datasources/ http://zeitgeist-project.com/
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) pytho
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-datasources/0.8/0.8.1/+download/zeitgeist-datasources-0.8.1.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a890d99b753226ec13cb22c450dc04e0
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-extensions-0.0.13-r2 b/metadata/md5-cache/gnome-extra/zeitgeist-extensions-0.0.13-r2
index a9ff2114d432..b1b0b17ac83e 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-extensions-0.0.13-r2
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-extensions-0.0.13-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Allow manipulating events before/after insertion as well as before f
 EAPI=5
 HOMEPAGE=https://launchpad.net/zeitgeist-extensions/
 IUSE=fts geolocation memprofile sqldebug tracker python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] fts? ( !gnome-extra/zeitgeist[fts] dev-libs/xapian-bindings[python] dev-python/dbus-python dev-python/pygobject dev-python/pyxdg ) geolocation? ( dev-python/dbus-python dev-python/python-geoclue ) memprofile? ( dev-python/dbus-python dev-python/pympler ) sqldebug? ( dev-python/python-sqlparse ) tracker? ( app-misc/tracker dev-python/pygobject dev-python/dbus-python )
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-extensions/trunk/fts-0.0.13/+download/zeitgeist-extensions-0.0.13.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e88c2a55a7d8052ea4db8fef1fd2f2ec
+_md5_=aa629c877f373648751911032af59cff
diff --git a/metadata/md5-cache/gnustep-base/gnustep-base-1.24.6-r1 b/metadata/md5-cache/gnustep-base/gnustep-base-1.24.6-r1
index 613b04a1ffe1..7a0a4222590d 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-base-1.24.6-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-base-1.24.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A library of general-purpose, non-graphical Objective C objects.
 EAPI=5
 HOMEPAGE=http://www.gnustep.org
 IUSE=+icu +libffi ssl zeroconf debug doc
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) ssl? ( net-libs/gnutls ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1 >=dev-libs/openssl-0.9.7 >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.6.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=79378e395f20afd05f1ade7af359bbca
+_md5_=181865d9bb4545e59aaeecf4872a6594
diff --git a/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r2 b/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r2
new file mode 100644
index 000000000000..481e98a6d942
--- /dev/null
+++ b/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.1.6
+DESCRIPTION=Virtual ebuilds that require internal com.sun classes from a JDK
+EAPI=5
+HOMEPAGE=http://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/icedtea-bin:6 dev-java/icedtea:6 dev-java/icedtea-bin:7 dev-java/icedtea:7 dev-java/oracle-jdk-bin:1.7 dev-java/oracle-jdk-bin:1.8 dev-java/diablo-jdk:1.6 dev-java/apple-jdk-bin:1.6 dev-java/apple-jdk-bin:1.5 dev-java/apple-jdk-bin:1.4 ) >=dev-java/java-config-2.1.6
+SLOT=0
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=ceddb2f3e2804ac06f8d501feeed043d
diff --git a/metadata/md5-cache/kde-base/akonadiconsole-4.13.0 b/metadata/md5-cache/kde-base/akonadiconsole-4.13.0
index 283e959fb6e7..9f1679524672 100644
--- a/metadata/md5-cache/kde-base/akonadiconsole-4.13.0
+++ b/metadata/md5-cache/kde-base/akonadiconsole-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Akonadi developer console
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=app-office/akonadi-server-1.12.1 >=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c4c73596fad611def71354c56b37f9ff
+_md5_=7aaa7ea4d2f5193dcd52ee6adad15b78
diff --git a/metadata/md5-cache/kde-base/akregator-4.13.0 b/metadata/md5-cache/kde-base/akregator-4.13.0
index d6a50bfb5ac2..d5b0dba76850 100644
--- a/metadata/md5-cache/kde-base/akregator-4.13.0
+++ b/metadata/md5-cache/kde-base/akregator-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE news feed aggregator.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/akregator
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=] kontact? ( >=kde-base/kontact-4.13.0:4[aqua=] )
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0aa467b592f85bba942ede073756620e
+_md5_=4543eccff487d3dfdd13507af7c87066
diff --git a/metadata/md5-cache/kde-base/artikulate-4.13.0 b/metadata/md5-cache/kde-base/artikulate-4.13.0
index 1c3432fb47bd..db1a1f33e22e 100644
--- a/metadata/md5-cache/kde-base/artikulate-4.13.0
+++ b/metadata/md5-cache/kde-base/artikulate-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Language learning application that helps improving pronunciation ski
 EAPI=5
 HOMEPAGE=http://edu.kde.org/applications/language/artikulate
 IUSE=debug gstreamer +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtxmlpatterns:4 media-libs/phonon gstreamer? ( media-libs/qt-gstreamer ) !gstreamer? ( dev-qt/qt-mobility[multimedia] ) >=kde-base/kqtquickcharts-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0:4[aqua=,handbook] ) >=dev-qt/qtdeclarative-4.8.5:4 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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/artikulate-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7a98ea7fdbf246af5d34febec6a846f3
+_md5_=0f9f1e5bee50b953a8fe1375b6f7efbb
diff --git a/metadata/md5-cache/kde-base/baloo-4.13.0 b/metadata/md5-cache/kde-base/baloo-4.13.0
index b0fc4eebe2f0..dfcf178920f2 100644
--- a/metadata/md5-cache/kde-base/baloo-4.13.0
+++ b/metadata/md5-cache/kde-base/baloo-4.13.0
@@ -3,12 +3,12 @@ DEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kfilemetadata-4.13.0:4[a
 DESCRIPTION=Next generation of the Nepomuk project
 EAPI=5
 HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+IUSE=debug +alternatekcm aqua
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kfilemetadata-4.13.0:4[aqua=] dev-libs/qjson =dev-libs/xapian-1.2*[chert] sys-apps/attr !<kde-base/nepomuk-4.12.50 >=kde-base/oxygen-icons-4.13.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.0:4[aqua=]
+RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kfilemetadata-4.13.0:4[aqua=] dev-libs/qjson =dev-libs/xapian-1.2*[chert] sys-apps/attr !<kde-base/nepomuk-4.12.50 alternatekcm? ( kde-misc/baloo-kcmadv ) >=kde-base/oxygen-icons-4.13.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.0:4[aqua=]
 RESTRICT=test
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/baloo-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b61a5c9cbd84a5dd70c941c2c7a4af8b
+_md5_=11f23abd79de069b12eaaca8ef10a13c
diff --git a/metadata/md5-cache/kde-base/baloo-widgets-4.13.0 b/metadata/md5-cache/kde-base/baloo-widgets-4.13.0
index f433a0fd1a36..15f3f4af81d8 100644
--- a/metadata/md5-cache/kde-base/baloo-widgets-4.13.0
+++ b/metadata/md5-cache/kde-base/baloo-widgets-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Widget library for baloo
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/baloo-4.13.0:4[aqua=] >=kde-base/kfilemetadata-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/baloo-widgets-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e9451e25ed84eefc81a664f7f65ed4ca
+_md5_=6a1baab81b8990ad9f3d03a9c147df40
diff --git a/metadata/md5-cache/kde-base/blogilo-4.13.0 b/metadata/md5-cache/kde-base/blogilo-4.13.0
index 3035f59e1c3e..967cf9a4eb9e 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.13.0
+++ b/metadata/md5-cache/kde-base/blogilo-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Blogging Client
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/blogilo
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=245299a7a3c1567287c9c2db0e4d84be
+_md5_=83082aa8ec2270708e58394da4017328
diff --git a/metadata/md5-cache/kde-base/calendarjanitor-4.13.0 b/metadata/md5-cache/kde-base/calendarjanitor-4.13.0
index 45312fc868ec..eac70b25958b 100644
--- a/metadata/md5-cache/kde-base/calendarjanitor-4.13.0
+++ b/metadata/md5-cache/kde-base/calendarjanitor-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=A tool to scan calendar data for buggy instances
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e2e4377a619df67a074733052b8e950d
+_md5_=9400fcdcda710376a93bfc8f5bb6232f
diff --git a/metadata/md5-cache/kde-base/contactthemeeditor-4.13.0 b/metadata/md5-cache/kde-base/contactthemeeditor-4.13.0
index 17a29b174cff..84238c9da393 100644
--- a/metadata/md5-cache/kde-base/contactthemeeditor-4.13.0
+++ b/metadata/md5-cache/kde-base/contactthemeeditor-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=A contact theme editor for KAddressBook
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kaddressbook-4.13.0:4[aqua=] >=kde-base/kmail-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ad914f15d5576d7c3a0438fd2133df74
+_md5_=e29cd38ca5060b1ee127d76de818f338
diff --git a/metadata/md5-cache/kde-base/dolphin-4.13.0 b/metadata/md5-cache/kde-base/dolphin-4.13.0
index 464f60cfc70a..c29348dd9099 100644
--- a/metadata/md5-cache/kde-base/dolphin-4.13.0
+++ b/metadata/md5-cache/kde-base/dolphin-4.13.0
@@ -4,7 +4,7 @@ DESCRIPTION=A KDE filemanager focusing on usability
 EAPI=5
 HOMEPAGE=http://dolphin.kde.org http://www.kde.org/applications/system/dolphin
 IUSE=debug semantic-desktop thumbnail +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 PDEPEND=thumbnail? ( >=kde-base/thumbnailers-4.13.0:4[aqua=] || ( >=kde-base/ffmpegthumbs-4.13.0:4[aqua=] >=kde-base/mplayerthumbs-4.13.0:4[aqua=] ) )
 RDEPEND=>=kde-base/kactivities-4.13.0:4[aqua=] >=kde-base/libkonq-4.13.0:4[aqua=] x11-libs/libXrender semantic-desktop? ( >=kde-base/baloo-4.13.0:4[aqua=] >=kde-base/baloo-widgets-4.13.0:4[aqua=] >=kde-base/kfilemetadata-4.13.0:4[aqua=] ) >=kde-base/kfind-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kde-baseapps-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=01802605dcff1df7a2f0c53830903e7c
+_md5_=889a37359ed7932fcc58886b54cb8b52
diff --git a/metadata/md5-cache/kde-base/kaddressbook-4.13.0 b/metadata/md5-cache/kde-base/kaddressbook-4.13.0
index 6f471b2c2f8e..d7bd8b5159df 100644
--- a/metadata/md5-cache/kde-base/kaddressbook-4.13.0
+++ b/metadata/md5-cache/kde-base/kaddressbook-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=The KDE Address Book
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/office/kaddressbook/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/grantlee-0.2.0 >=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=] kontact? ( >=kde-base/kontact-4.13.0:4[aqua=] )
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=eec438ea63cd50ecf9e9da3f662aa91d
+_md5_=f597bf596274d21dcc95314425db77ff
diff --git a/metadata/md5-cache/kde-base/kalarm-4.13.0 b/metadata/md5-cache/kde-base/kalarm-4.13.0
index aef2dd619865..8ca64493c47f 100644
--- a/metadata/md5-cache/kde-base/kalarm-4.13.0
+++ b/metadata/md5-cache/kde-base/kalarm-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Personal alarm message, command and email scheduler for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KAlarm
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] media-libs/phonon x11-libs/libX11 >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=91e1d3a20f7313ceb788cd9ff48e678b
+_md5_=4bcb11d61c38a9f868725f897c64c24a
diff --git a/metadata/md5-cache/kde-base/kde-meta-4.13.0 b/metadata/md5-cache/kde-base/kde-meta-4.13.0
index 4d8fd6e8f36c..735714c2a971 100644
--- a/metadata/md5-cache/kde-base/kde-meta-4.13.0
+++ b/metadata/md5-cache/kde-base/kde-meta-4.13.0
@@ -3,9 +3,9 @@ DESCRIPTION=KDE - merge this to pull in all split kde-base/* packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=accessibility nls sdk semantic-desktop aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/kate-4.13.0:4[aqua=] >=kde-base/kdeadmin-meta-4.13.0:4[aqua=] >=kde-base/kdeartwork-meta-4.13.0:4[aqua=] >=kde-base/kdebase-meta-4.13.0:4[aqua=] >=kde-base/kdeedu-meta-4.13.0:4[aqua=] >=kde-base/kdegames-meta-4.13.0:4[aqua=] >=kde-base/kdegraphics-meta-4.13.0:4[aqua=] >=kde-base/kdemultimedia-meta-4.13.0:4[aqua=] >=kde-base/kdenetwork-meta-4.13.0:4[aqua=] >=kde-base/kdeplasma-addons-4.13.0:4[aqua=] >=kde-base/kdetoys-meta-4.13.0:4[aqua=] >=kde-base/kdeutils-meta-4.13.0:4[aqua=] accessibility? ( >=kde-base/kdeaccessibility-meta-4.13.0:4[aqua=] ) nls? ( >=kde-base/kde-l10n-4.13.0:4[aqua=] ) sdk? ( >=kde-base/kdebindings-meta-4.13.0:4[aqua=] >=kde-base/kdesdk-meta-4.13.0:4[aqua=] >=kde-base/kdewebdev-meta-4.13.0:4[aqua=] ) semantic-desktop? ( >=kde-base/kdepim-meta-4.4.11.1:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e2f1086225220408063c741473062991
+_md5_=ba0864bde49ffc87dc6b231c4578b2e6
diff --git a/metadata/md5-cache/kde-base/kdebase-meta-4.13.0 b/metadata/md5-cache/kde-base/kdebase-meta-4.13.0
index ed7cc8675091..b9ac100f7273 100644
--- a/metadata/md5-cache/kde-base/kdebase-meta-4.13.0
+++ b/metadata/md5-cache/kde-base/kdebase-meta-4.13.0
@@ -3,9 +3,9 @@ DESCRIPTION=Merge this to pull in all kdebase-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=+wallpapers aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/dolphin-4.13.0:4[aqua=] >=kde-base/freespacenotifier-4.11:4[aqua=] >=kde-base/kcheckpass-4.11:4[aqua=] >=kde-base/kcminit-4.11:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.11:4[aqua=] ) >=kde-base/kde-base-artwork-4.13.0:4[aqua=] >=kde-base/kdebase-cursors-4.11:4[aqua=] >=kde-base/kdebase-runtime-meta-4.13.0:4[aqua=] >=kde-base/kdebase-startkde-4.11:4[aqua=] >=kde-base/kdepasswd-4.13.0:4[aqua=] >=kde-base/kdialog-4.13.0:4[aqua=] >=kde-base/keditbookmarks-4.13.0:4[aqua=] >=kde-base/kephal-4.11:4[aqua=] >=kde-base/kfind-4.13.0:4[aqua=] >=kde-base/kfmclient-4.13.0:4[aqua=] >=kde-base/khotkeys-4.11:4[aqua=] >=kde-base/kinfocenter-4.11:4[aqua=] >=kde-base/klipper-4.11:4[aqua=] >=kde-base/kmenuedit-4.11:4[aqua=] >=kde-base/konq-plugins-4.13.0:4[aqua=] >=kde-base/konqueror-4.13.0:4[aqua=] >=kde-base/konsole-4.13.0:4[aqua=] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/kscreensaver-4.11:4[aqua=] >=kde-base/ksmserver-4.11:4[aqua=] >=kde-base/ksplash-4.11:4[aqua=] >=kde-base/kstartupconfig-4.11:4[aqua=] >=kde-base/kstyles-4.11:4[aqua=] >=kde-base/ksysguard-4.11:4[aqua=] >=kde-base/ksystraycmd-4.11:4[aqua=] >=kde-base/kwin-4.11:4[aqua=] >=kde-base/kwrite-4.13.0:4[aqua=] >=kde-base/kwrited-4.11:4[aqua=] >=kde-base/libkonq-4.13.0:4[aqua=] >=kde-base/libkworkspace-4.11:4[aqua=] >=kde-base/liboxygenstyle-4.11:4[aqua=] >=kde-base/libplasmaclock-4.11:4[aqua=] >=kde-base/libplasmagenericshell-4.11:4[aqua=] >=kde-base/libtaskmanager-4.11:4[aqua=] >=kde-base/nsplugins-4.13.0:4[aqua=] >=kde-base/phonon-kde-4.13.0:4[aqua=] >=kde-base/plasma-apps-4.13.0:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=] >=kde-base/powerdevil-4.11:4[aqua=] >=kde-base/qguiplatformplugin_kde-4.11:4[aqua=] >=kde-base/solid-actions-kcm-4.11:4[aqua=] >=kde-base/systemsettings-4.11:4[aqua=] !prefix? ( >=kde-base/kdm-4.11:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c917cd0cbbbaf3a071571ad5cf73d31c
+_md5_=616b12b9ce040653fbe0c0c6cbb35bb1
diff --git a/metadata/md5-cache/kde-base/kdeedu-meta-4.13.0 b/metadata/md5-cache/kde-base/kdeedu-meta-4.13.0
index 5e22f348c6ae..3dfbbcd217e8 100644
--- a/metadata/md5-cache/kde-base/kdeedu-meta-4.13.0
+++ b/metadata/md5-cache/kde-base/kdeedu-meta-4.13.0
@@ -3,9 +3,9 @@ DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived pack
 EAPI=5
 HOMEPAGE=http://edu.kde.org
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/analitza-4.13.0:4[aqua=] >=kde-base/artikulate-4.13.0:4[aqua=] >=kde-base/blinken-4.13.0:4[aqua=] >=kde-base/cantor-4.13.0:4[aqua=] >=kde-base/kalgebra-4.13.0:4[aqua=] >=kde-base/kalzium-4.13.0:4[aqua=] >=kde-base/kanagram-4.13.0:4[aqua=] >=kde-base/kbruch-4.13.0:4[aqua=] >=kde-base/kgeography-4.13.0:4[aqua=] >=kde-base/khangman-4.13.0:4[aqua=] >=kde-base/kig-4.13.0:4[aqua=] >=kde-base/kiten-4.13.0:4[aqua=] >=kde-base/klettres-4.13.0:4[aqua=] >=kde-base/kmplot-4.13.0:4[aqua=] >=kde-base/kqtquickcharts-4.13.0:4[aqua=] >=kde-base/kstars-4.13.0:4[aqua=] >=kde-base/ktouch-4.13.0:4[aqua=] >=kde-base/kturtle-4.13.0:4[aqua=] >=kde-base/kwordquiz-4.13.0:4[aqua=] >=kde-base/libkdeedu-4.13.0:4[aqua=] >=kde-base/marble-4.13.0:4[aqua=] >=kde-base/pairs-4.13.0:4[aqua=] >=kde-base/parley-4.13.0:4[aqua=] !ppc64? ( >=kde-base/rocs-4.13.0:4[aqua=] ) >=kde-base/step-4.13.0:4[aqua=]
 SLOT=4
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4d13236b3cd98f00aca76f3aac24eeff
+_md5_=a6917fc173f0f74647e4c27131b6a837
diff --git a/metadata/md5-cache/kde-base/kdepim-common-libs-4.13.0 b/metadata/md5-cache/kde-base/kdepim-common-libs-4.13.0
index 5206b6056e15..70f2bf862c1d 100644
--- a/metadata/md5-cache/kde-base/kdepim-common-libs-4.13.0
+++ b/metadata/md5-cache/kde-base/kdepim-common-libs-4.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=Common libraries for KDE PIM apps
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme >=app-office/akonadi-server-1.12.1 dev-libs/grantlee >=kde-base/baloo-4.13.0:4[aqua=] >=kde-base/kdepimlibs-4.13.0:4[aqua=] !kde-base/akonadi:4 !kde-base/libkdepim:4 !kde-base/libkleo:4 !kde-base/libkpgp:4 !<kde-base/kaddressbook-4.11.50:4 !kde-base/kdepim-wizards:4 !<kde-base/kmail-4.4.80:4 !=kde-base/kmail-4.12.0 !=kde-base/kmail-4.12.1 !=kde-base/kmail-4.11* !<kde-base/korganizer-4.5.67:4 app-crypt/gnupg >=kde-base/kdepim-runtime-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.0:4[aqua=]
 RESTRICT=test
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fec552dc59b137b6a66d266eb7802641
+_md5_=3a87e19b87712056871354d97aa25b58
diff --git a/metadata/md5-cache/kde-base/kdepim-kresources-4.13.0 b/metadata/md5-cache/kde-base/kdepim-kresources-4.13.0
index d4d56277596d..908bae770725 100644
--- a/metadata/md5-cache/kde-base/kdepim-kresources-4.13.0
+++ b/metadata/md5-cache/kde-base/kdepim-kresources-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE PIM groupware plugin collection
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=96ea8e79a1fc3f99724d6bd4078ecc03
+_md5_=a59d26c8eb2a9343be6ccdd677771e48
diff --git a/metadata/md5-cache/kde-base/kdepim-meta-4.13.0 b/metadata/md5-cache/kde-base/kdepim-meta-4.13.0
index a56bef53a380..86271d605bbd 100644
--- a/metadata/md5-cache/kde-base/kdepim-meta-4.13.0
+++ b/metadata/md5-cache/kde-base/kdepim-meta-4.13.0
@@ -3,9 +3,9 @@ DESCRIPTION=kdepim - merge this to pull in all kdepim-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://community.kde.org/KDE_PIM
 IUSE=nls aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/akonadiconsole-4.13.0:4[aqua=] >=kde-base/akregator-4.13.0:4[aqua=] >=kde-base/blogilo-4.13.0:4[aqua=] >=kde-base/calendarjanitor-4.13.0:4[aqua=] >=kde-base/contactthemeeditor-4.13.0:4[aqua=] >=kde-base/kabcclient-4.13.0:4[aqua=] >=kde-base/kaddressbook-4.13.0:4[aqua=] >=kde-base/kalarm-4.13.0:4[aqua=] >=kde-base/kdepim-icons-4.13.0:4[aqua=] >=kde-base/kdepim-kresources-4.13.0:4[aqua=] >=kde-base/kdepim-runtime-4.13.0:4[aqua=] >=kde-base/kjots-4.13.0:4[aqua=] >=kde-base/kleopatra-4.13.0:4[aqua=] >=kde-base/kmail-4.13.0:4[aqua=] >=kde-base/knode-4.13.0:4[aqua=] >=kde-base/knotes-4.13.0:4[aqua=] >=kde-base/konsolekalendar-4.13.0:4[aqua=] >=kde-base/kontact-4.13.0:4[aqua=] >=kde-base/korganizer-4.13.0:4[aqua=] >=kde-base/ktimetracker-4.13.0:4[aqua=] >=kde-base/ktnef-4.13.0:4[aqua=] nls? ( >=kde-base/kde-l10n-4.13.0:4[aqua=] >=kde-base/kdepim-l10n-4.13.0:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cb4250025888dede232132ed017ef5a3
+_md5_=97b8e488e4aff5f07853c05fc4786f5b
diff --git a/metadata/md5-cache/kde-base/kfilemetadata-4.13.0 b/metadata/md5-cache/kde-base/kfilemetadata-4.13.0
index ca30851d3217..37f9aeb6a995 100644
--- a/metadata/md5-cache/kde-base/kfilemetadata-4.13.0
+++ b/metadata/md5-cache/kde-base/kfilemetadata-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library for extracting file metadata
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug epub exif ffmpeg mobi pdf taglib aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( virtual/ffmpeg ) mobi? ( >=kde-base/kdegraphics-mobipocket-4.13.0:4[aqua=] ) pdf? ( app-text/poppler[qt4] ) taglib? ( media-libs/taglib ) >=kde-base/oxygen-icons-4.13.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kfilemetadata-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=94a566fa2fa0d3b4b004a634c3e9cb37
+_md5_=8547a663a27c3fd2d6338fdedd55a915
diff --git a/metadata/md5-cache/kde-base/kjots-4.13.0 b/metadata/md5-cache/kde-base/kjots-4.13.0
index 1d0c22d9a95b..30841c7d1839 100644
--- a/metadata/md5-cache/kde-base/kjots-4.13.0
+++ b/metadata/md5-cache/kde-base/kjots-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE note taking utility
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kjots/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/grantlee-0.2.0 >=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=] kontact? ( >=kde-base/kontact-4.13.0:4[aqua=] )
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f18f4221267ff17f3091810eb7d2f6f6
+_md5_=4475a1c096897fdac6e08c6a2eba662b
diff --git a/metadata/md5-cache/kde-base/kleopatra-4.13.0 b/metadata/md5-cache/kde-base/kleopatra-4.13.0
index f1ca39b35caf..ece01ee0d030 100644
--- a/metadata/md5-cache/kde-base/kleopatra-4.13.0
+++ b/metadata/md5-cache/kde-base/kleopatra-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Kleopatra - KDE X.509 key manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kleopatra/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1.3.2 dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9b48f198371cdf2b4abbd76287db5ac1
+_md5_=933d27e566629fd63a8fb92db51b7a7f
diff --git a/metadata/md5-cache/kde-base/kmail-4.13.0 b/metadata/md5-cache/kde-base/kmail-4.13.0
index 01ec3531602f..d56115aabb9b 100644
--- a/metadata/md5-cache/kde-base/kmail-4.13.0
+++ b/metadata/md5-cache/kde-base/kmail-4.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=KMail is the email component of Kontact, the integrated personal inf
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/kmail/
 IUSE=debug test +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/korganizer-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.12.1-r2:4[aqua=] !=kde-base/kdepim-common-libs-4.12.1-r1 >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=] kontact? ( >=kde-base/kontact-4.13.0:4[aqua=] )
 RESTRICT=test
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cf8fde4853ce629751da1b4b7f8ee2fe
+_md5_=78eb630d9f0315c829694f2f698cf53c
diff --git a/metadata/md5-cache/kde-base/knode-4.13.0 b/metadata/md5-cache/kde-base/knode-4.13.0
index f28d3115202b..5ada43c52de3 100644
--- a/metadata/md5-cache/kde-base/knode-4.13.0
+++ b/metadata/md5-cache/kde-base/knode-4.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=A newsreader for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/knode/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.12.1-r1:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=] kontact? ( >=kde-base/kontact-4.13.0:4[aqua=] )
 RESTRICT=test
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6cffec46b1aa8354aaeca1b96509da7e
+_md5_=c37209021844d1911cb21d4d67f47eb2
diff --git a/metadata/md5-cache/kde-base/knotes-4.13.0 b/metadata/md5-cache/kde-base/knotes-4.13.0
index bff6ae53f00b..1010e0dbad2b 100644
--- a/metadata/md5-cache/kde-base/knotes-4.13.0
+++ b/metadata/md5-cache/kde-base/knotes-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Notes application
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/knotes/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=] kontact? ( >=kde-base/kontact-4.13.0:4[aqua=] )
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=91d6c233079b774438fc31d83d72fd0b
+_md5_=a8a048e21c0faec9d1218a23432b1061
diff --git a/metadata/md5-cache/kde-base/konsolekalendar-4.13.0 b/metadata/md5-cache/kde-base/konsolekalendar-4.13.0
index edf0e4d6dd64..5562bbca08c9 100644
--- a/metadata/md5-cache/kde-base/konsolekalendar-4.13.0
+++ b/metadata/md5-cache/kde-base/konsolekalendar-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=A command line interface to KDE calendars
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KonsoleKalendar
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=45017f4f7f6e08e0e008ae9264ec8f61
+_md5_=4406477697f6ad785ffd9ec23d7e3e9e
diff --git a/metadata/md5-cache/kde-base/kontact-4.13.0 b/metadata/md5-cache/kde-base/kontact-4.13.0
index 25eef6d2c13e..801651b7488d 100644
--- a/metadata/md5-cache/kde-base/kontact-4.13.0
+++ b/metadata/md5-cache/kde-base/kontact-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE personal information manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/office/kontact/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c1ba77ddb0155b52939393d82a6ce570
+_md5_=fc0aa71125e553d7a0d91dd03d7c55c5
diff --git a/metadata/md5-cache/kde-base/korganizer-4.13.0 b/metadata/md5-cache/kde-base/korganizer-4.13.0
index f4f9f31addf5..b934985e0238 100644
--- a/metadata/md5-cache/kde-base/korganizer-4.13.0
+++ b/metadata/md5-cache/kde-base/korganizer-4.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Personal Organizer for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/office/korganizer/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] sys-libs/zlib >=kde-base/ktimezoned-4.13.0:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=] kontact? ( >=kde-base/kontact-4.13.0:4[aqua=] )
 RESTRICT=test
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c23d0ec3e394179558d78a6e472a2d7f
+_md5_=b1a2bcb5753045bd2f59ab30756d10b7
diff --git a/metadata/md5-cache/kde-base/kqtquickcharts-4.13.0 b/metadata/md5-cache/kde-base/kqtquickcharts-4.13.0
index ca3a57b00352..1a103d409c79 100644
--- a/metadata/md5-cache/kde-base/kqtquickcharts-4.13.0
+++ b/metadata/md5-cache/kde-base/kqtquickcharts-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Qt Quick 1 plugin for beautiful and interactive charts
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.11:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] >=dev-qt/qtdeclarative-4.8.5:4 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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kqtquickcharts-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b5cf277de7ccc3772c343020a2820a01
+_md5_=a72d47027df38f4e7eca93e053324625
diff --git a/metadata/md5-cache/kde-base/ktimetracker-4.13.0 b/metadata/md5-cache/kde-base/ktimetracker-4.13.0
index 790688c71017..c664584cee74 100644
--- a/metadata/md5-cache/kde-base/ktimetracker-4.13.0
+++ b/metadata/md5-cache/kde-base/ktimetracker-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=KTimeTracker tracks time spent on various tasks.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepim-kresources-4.13.0:4[aqua=] >=kde-base/kdepimlibs-4.13.0:4[aqua=] >=kde-base/kdepim-common-libs-4.13.0:4[aqua=] x11-libs/libXScrnSaver >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=] kontact? ( >=kde-base/kontact-4.13.0:4[aqua=] )
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/kdepim-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	97113cf32601e2540deb6be6d384212d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ace01629ead6fb092710138e21e38fef
+_md5_=ab370f55326a762885d7127c596633f2
diff --git a/metadata/md5-cache/kde-base/ktouch-4.13.0 b/metadata/md5-cache/kde-base/ktouch-4.13.0
index 198bf0d2d9dd..14ceff478ba5 100644
--- a/metadata/md5-cache/kde-base/ktouch-4.13.0
+++ b/metadata/md5-cache/kde-base/ktouch-4.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A program that helps you to learn and practice touch typing
 EAPI=5
 HOMEPAGE=http://edu.kde.org/applications/miscellaneous/ktouch
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.13.0:4[aqua=] >=kde-base/kqtquickcharts-4.13.0:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=] >=kde-base/oxygen-icons-4.13.0:4[aqua=] handbook? ( >=kde-base/kdelibs-4.13.0: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.0:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/4.13.0/src/ktouch-4.13.0.tar.xz
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4f1a02cfa17d2818ed01c97b6e788f21
+_md5_=4c590736bce43f4f0b2ad549a34605f0
diff --git a/metadata/md5-cache/kde-misc/homerun-1.2.2 b/metadata/md5-cache/kde-misc/homerun-1.2.2
deleted file mode 100644
index 45f9567b145d..000000000000
--- a/metadata/md5-cache/kde-misc/homerun-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/libkonq-4.10:4[aqua=] >=kde-base/libkworkspace-4.10:4[aqua=] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.5:4 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.10:4[aqua=]
-DESCRIPTION=Application launcher for KDE Plasma desktop
-EAPI=5
-HOMEPAGE=https://projects.kde.org/projects/playground/base/homerun
-IUSE=debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_lt linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN test aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1 BSD
-RDEPEND=>=kde-base/libkonq-4.10:4[aqua=] >=kde-base/libkworkspace-4.10:4[aqua=] >=kde-base/plasma-workspace-4.10:4[aqua=] >=kde-base/oxygen-icons-4.10:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_es(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lt(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_CN(+)] ) >=dev-qt/qtdeclarative-4.8.5:4 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.10:4[aqua=]
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://kde/stable/homerun/src/homerun-1.2.2.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e650e7ad8ffb4dc1480165dd036d653a
diff --git a/metadata/md5-cache/kde-misc/homerun-1.2.4 b/metadata/md5-cache/kde-misc/homerun-1.2.4
new file mode 100644
index 000000000000..98a8af5e6816
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/homerun-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/libkonq-4.10:4[aqua=] >=kde-base/libkworkspace-4.10:4[aqua=] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.5:4 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.10:4[aqua=]
+DESCRIPTION=Application launcher for KDE Plasma desktop
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/playground/base/homerun
+IUSE=debug linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_gl linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_sk linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN test aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 BSD
+RDEPEND=>=kde-base/libkonq-4.10:4[aqua=] >=kde-base/libkworkspace-4.10:4[aqua=] >=kde-base/plasma-workspace-4.10:4[aqua=] >=kde-base/oxygen-icons-4.10:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_es(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_it(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ro(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_CN(+)] ) >=dev-qt/qtdeclarative-4.8.5:4 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.10:4[aqua=]
+RESTRICT=test
+SLOT=4
+SRC_URI=mirror://kde/stable/homerun/src/homerun-1.2.4.tar.xz
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=2e6c633969d9f402db5badc1518466ff
diff --git a/metadata/md5-cache/kde-misc/kcm-grub2-0.6.4-r1 b/metadata/md5-cache/kde-misc/kcm-grub2-0.6.4-r1
new file mode 100644
index 000000000000..deaacfd0c49d
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kcm-grub2-0.6.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=hwinfo? ( sys-apps/hwinfo ) imagemagick? ( media-gfx/imagemagick ) packagekit? ( app-admin/packagekit-qt4 ) dev-util/automoc >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=KCModule for configuring the GRUB2 bootloader.
+EAPI=5
+HOMEPAGE=http://kde-apps.org/content/show.php?content=139643
+IUSE=+hwinfo imagemagick packagekit linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_lt linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_uk linguas_tr linguas_zh_TW aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=hwinfo? ( sys-apps/hwinfo ) imagemagick? ( media-gfx/imagemagick ) packagekit? ( app-admin/packagekit-qt4 ) >=kde-base/kcmshell-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] 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_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_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) 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_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) 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_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://sourceforge/kcm-grub2/0.6.4/kcm-grub2-0.6.4.tar.gz
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	4f85356160aa721ee3f4be09609def19	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=0927a142cf699edeb155bf01c15c713a
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2
index 6f101a4c3e32..463a88cd4507 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit upower? ( sys-power/upower )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=7a9f83a3dc673f52a89a9ca0979ec2e8
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1
index 10d8f3642119..668fd0dd0569 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( sys-power/upower )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=719f19f11c3006a3e24cb341516ddfa5
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2
index c62bc6f7123e..9fe6aa5ee5c6 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( sys-power/upower )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=548ade0cf221c76b53915fd2c6f65075
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
index de70de1fba43..709305e5dcd5 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( sys-power/upower )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=5a8ab0042fd875a20eed4d0271ab7f22
diff --git a/metadata/md5-cache/mail-client/geary-0.4.3 b/metadata/md5-cache/mail-client/geary-0.4.3
index 7a739361046a..05136c1160b2 100644
--- a/metadata/md5-cache/mail-client/geary-0.4.3
+++ b/metadata/md5-cache/mail-client/geary-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/libsecret dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libgee-0.8.5:0.8 dev-libs/libunique:3 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 nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=app-crypt/libsecret dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libgee-0.8.5:0.8 dev-libs/libunique:3 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 nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
 EAPI=5
 HOMEPAGE=http://www.yorba.org/projects/geary/
@@ -9,5 +9,5 @@ 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/libunique:3 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.4/geary-0.4.3.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=cf92ebf949aba18872200265ae835d57
diff --git a/metadata/md5-cache/mail-client/geary-0.5.2 b/metadata/md5-cache/mail-client/geary-0.5.2
index 5ad8056872c1..b740d04e1998 100644
--- a/metadata/md5-cache/mail-client/geary-0.5.2
+++ b/metadata/md5-cache/mail-client/geary-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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 nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.22 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=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 nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
 EAPI=5
 HOMEPAGE=http://www.yorba.org/projects/geary/
@@ -9,5 +9,5 @@ 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.5/geary-0.5.2.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=8214c754efce1f4a9279e5d39c20cdf5
diff --git a/metadata/md5-cache/mail-client/geary-0.5.3 b/metadata/md5-cache/mail-client/geary-0.5.3
index fbfbc5266a4f..c572e245c13a 100644
--- a/metadata/md5-cache/mail-client/geary-0.5.3
+++ b/metadata/md5-cache/mail-client/geary-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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 nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.22 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=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 nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
 EAPI=5
 HOMEPAGE=http://www.yorba.org/projects/geary/
@@ -9,5 +9,5 @@ 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.5/geary-0.5.3.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=fa3d7049232594786d921dea62e86431
diff --git a/metadata/md5-cache/mail-client/geary-0.6.0 b/metadata/md5-cache/mail-client/geary-0.6.0
index 8a6dc9900d41..534154825787 100644
--- a/metadata/md5-cache/mail-client/geary-0.6.0
+++ b/metadata/md5-cache/mail-client/geary-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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 app-text/gnome-doc-utils dev-util/desktop-file-utils nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.22 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=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 app-text/gnome-doc-utils dev-util/desktop-file-utils nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
 EAPI=5
 HOMEPAGE=http://www.yorba.org/projects/geary/
@@ -9,5 +9,5 @@ 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.0.tar.xz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=0a6f87d86d371b3335931dc8365ad30e
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.6.2 b/metadata/md5-cache/mate-base/libmatekbd-1.6.2
index f2d4084b32fc..3cd637f92a33 100644
--- a/metadata/md5-cache/mate-base/libmatekbd-1.6.2
+++ b/metadata/md5-cache/mate-base/libmatekbd-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=MATE keyboard configuration library
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.18:2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.0:0 x11-libs/pango:0 virtual/libintl:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/libmatekbd-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=58471c3c44169c0c46c38cdb2fb6b429
+_md5_=91da51b0814c22e87fa2d3b07c9333a0
diff --git a/metadata/md5-cache/mate-base/libmatekeyring-1.6.1 b/metadata/md5-cache/mate-base/libmatekeyring-1.6.1
index e4d778b0463c..5217ccb9e2b3 100644
--- a/metadata/md5-cache/mate-base/libmatekeyring-1.6.1
+++ b/metadata/md5-cache/mate-base/libmatekeyring-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Compatibility library for accessing secrets for MATE
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=debug test debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libgcrypt-1.2.2:0= >=mate-base/mate-keyring-1.6:0[test?] >=sys-apps/dbus-1:0 virtual/libintl:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/libmatekeyring-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c7363221d0306e5171993a52f8a4288d
+_md5_=a728e042c0d94bf6931ad3e63508b6f0
diff --git a/metadata/md5-cache/mate-base/mate-1.6.0 b/metadata/md5-cache/mate-base/mate-1.6.0
index 55720d8af5a6..5c19a3c9bf02 100644
--- a/metadata/md5-cache/mate-base/mate-1.6.0
+++ b/metadata/md5-cache/mate-base/mate-1.6.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=bluetooth +extras
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=metapackage
 RDEPEND=>=mate-base/mate-applets-1.6:0 >=mate-base/mate-control-center-1.6:0 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-file-manager-1.6:0 >=mate-base/mate-menus-1.6:0 >=mate-base/mate-panel-1.6:0 >=mate-base/mate-session-manager-1.6:0 >=mate-base/mate-settings-daemon-1.6:0 >=mate-extra/mate-media-1.6:0 >=x11-misc/mate-menu-editor-1.6:0 >=x11-terms/mate-terminal-1.6:0 >=x11-themes/mate-backgrounds-1.6:0 >=x11-themes/mate-icon-theme-1.6:0 >=x11-themes/mate-themes-1.6:0 >=x11-wm/mate-window-manager-1.6:0 virtual/notification-daemon:0 bluetooth? ( >=net-wireless/mate-bluetooth-1.6:0 ) extras? ( >=app-arch/mate-file-archiver-1.6:0 >=app-editors/mate-text-editor-1.6:0 >=app-text/mate-document-viewer-1.6:0 >=mate-extra/mate-calc-1.6:0 >=mate-extra/mate-character-map-1.6:0 >=mate-extra/mate-power-manager-1.6:0 >=mate-extra/mate-screensaver-1.6:0 >=mate-extra/mate-system-monitor-1.6:0 >=mate-extra/mate-utils-1.6:0 >=media-gfx/mate-image-viewer-1.6:0 )
 SLOT=0
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=14675065d771b45d992e1f1fa6d0f18e
+_md5_=22dbb0d3717e91c2f622030376197f71
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.6.2 b/metadata/md5-cache/mate-base/mate-applets-1.6.2
index 9c554055acfa..411a8c526e3d 100644
--- a/metadata/md5-cache/mate-base/mate-applets-1.6.2
+++ b/metadata/md5-cache/mate-base/mate-applets-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Applets for the MATE Desktop and Panel
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X ipv6 networkmanager policykit python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.22:2 >=dev-libs/libmateweather-1.6.1:0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-panel-1.6:0 >=mate-base/mate-settings-daemon-1.6:0 >=mate-extra/mate-character-map-1.6:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpufrequtils:0 >=sys-power/upower-0.9.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 >=x11-libs/libmatewnck-1.6:0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-themes/mate-icon-theme-1.6:0 virtual/libintl:0 networkmanager? ( >=net-misc/networkmanager-0.7:0 ) policykit? ( >=sys-auth/polkit-0.92:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-applets-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=21bc3d70c7237c52d1cd2ea023e5da75
+_md5_=acd89cf62717c40ac2562a92072bbb46
diff --git a/metadata/md5-cache/mate-base/mate-common-1.6.2 b/metadata/md5-cache/mate-base/mate-common-1.6.2
index 3550d3b62916..dfe0f0cf9e1f 100644
--- a/metadata/md5-cache/mate-base/mate-common-1.6.2
+++ b/metadata/md5-cache/mate-base/mate-common-1.6.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Common files for development of MATE packages
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-common-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=987e327d81532390adb18111292c4922
+_md5_=f8b73db83402be3ea5296cec96317c6a
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.6.2 b/metadata/md5-cache/mate-base/mate-control-center-1.6.2
index f5089e72ad8a..caf4df77e295 100644
--- a/metadata/md5-cache/mate-base/mate-control-center-1.6.2
+++ b/metadata/md5-cache/mate-base/mate-control-center-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=The MATE Desktop configuration tool
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.28:2 dev-libs/libunique:1 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6:0 >=mate-base/mate-desktop-1.6:0 <mate-base/mate-desktop-1.7:0 >=mate-base/mate-file-manager-1.6:0 >=mate-base/mate-menus-1.6:0 >=mate-base/mate-settings-daemon-1.6:0 >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 media-libs/libcanberra:0[gtk] >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 x11-libs/libXft:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/mate-window-manager-1.6:0 virtual/libintl:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-control-center-1.6.2.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3b9973782a68500f044e1bb0a2e673c5
+_md5_=51e371998ba99905f1d0eb9b2e17161b
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.6.2-r1 b/metadata/md5-cache/mate-base/mate-desktop-1.6.2-r1
index ed6da1854703..1a1889522a46 100644
--- a/metadata/md5-cache/mate-base/mate-desktop-1.6.2-r1
+++ b/metadata/md5-cache/mate-base/mate-desktop-1.6.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X startup-notification debug python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-libs/glib-2.34:2 >=dev-libs/libunique-1:1 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2 >=x11-libs/gtk+-2.24:2 x11-libs/libX11:0 >=x11-libs/libXrandr-1.2:0 virtual/libintl:0 startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-desktop-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0cb5b3b4da173ed900cf3e5f796a1213
+_md5_=324706a99c6fa7a7ad16932f4626942e
diff --git a/metadata/md5-cache/mate-base/mate-file-manager-1.6.3-r1 b/metadata/md5-cache/mate-base/mate-file-manager-1.6.3-r1
index 5f79bdf76cc4..6bc96b281c1c 100644
--- a/metadata/md5-cache/mate-base/mate-file-manager-1.6.3-r1
+++ b/metadata/md5-cache/mate-base/mate-file-manager-1.6.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Caja file manager for the MATE desktop
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X +mate +introspection +unique xmp debug test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 LGPL-2 FDL-1.1
 PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.6:0 )
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.28:2 >=dev-libs/libxml2-2.4.7:2 || ( >=gnome-base/gvfs-1.10.1:0[gdu] >=gnome-base/gvfs-1.10.1:0[udisks] ) >=mate-base/mate-desktop-1.6:0 >=media-libs/libexif-0.5.12:0 >=x11-libs/gtk+-2.24:2[introspection?] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.4:0 ) unique? ( >=dev-libs/libunique-1:1 ) xmp? ( >=media-libs/exempi-1.99.2:2 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-file-manager-1.6.3.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=957b5dd3ceadbadc8eea20c835ecf16a
+_md5_=3522fc5d3089eb5c8555f87d0cf44522
diff --git a/metadata/md5-cache/mate-base/mate-keyring-1.6.1 b/metadata/md5-cache/mate-base/mate-keyring-1.6.1
index a31853935d7c..6500abd0e293 100644
--- a/metadata/md5-cache/mate-base/mate-keyring-1.6.1
+++ b/metadata/md5-cache/mate-base/mate-keyring-1.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Password and keyring managing daemon for MATE
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=debug +gpg-agent pam +ssh-agent test debug test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 LGPL-2
 PDEPEND=>=mate-base/libmatekeyring-1.6:0
 RDEPEND=>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.20:2 >=sys-apps/dbus-1:0 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-0.3.4:0= sys-libs/libcap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 pam? ( virtual/pam:0 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-keyring-1.6.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cd6b33cc33fd90ff290e069b3236d62d
+_md5_=19c33736d0060f4569bc6460f659dffe
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.6.0 b/metadata/md5-cache/mate-base/mate-menus-1.6.0
index b549c657f63b..03bdfc89b48b 100644
--- a/metadata/md5-cache/mate-base/mate-menus-1.6.0
+++ b/metadata/md5-cache/mate-base/mate-menus-1.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=MATE menu system, implementing the F.D.O cross-desktop spec
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=debug +introspection python python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.15.2:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 ) python? ( dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-menus-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7f8cad29f28fdd009aab3ce67a0be618
+_md5_=a9025007b23d27a955694db714b0b21a
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.6.1 b/metadata/md5-cache/mate-base/mate-panel-1.6.1
index b6d3d85e78cf..9f19d0f2de7b 100644
--- a/metadata/md5-cache/mate-base/mate-panel-1.6.1
+++ b/metadata/md5-cache/mate-base/mate-panel-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=The MATE panel
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X +introspection networkmanager
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.26:2 >=dev-libs/libmateweather-1.6 dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 gnome-base/librsvg:2 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-menus-1.6:0 >=media-libs/libcanberra-0.23:0[gtk] >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libmatewnck-1.5.1:0 x11-libs/libXau:0 >=x11-libs/libXrandr-1.2:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 ) networkmanager? ( >=net-misc/networkmanager-0.6:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-panel-1.6.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3b186875fbf92455eeb164d7360ebc71
+_md5_=cc04e218abd32459a96eb55fb00d8a1d
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.6.1-r1 b/metadata/md5-cache/mate-base/mate-session-manager-1.6.1-r1
index 15fe98cd7585..ad174e42a077 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.6.1-r1
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.6.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=MATE session manager
 EAPI=5
 HOMEPAGE=http://mate-desktop.org/
 IUSE=ipv6 elibc_FreeBSD gnome-keyring systemd debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/dbus-glib-0.76:0 >=dev-libs/glib-2.25:2 dev-libs/libxslt:0 sys-apps/dbus:0 >=sys-power/upower-0.9.0:0 x11-apps/xdpyinfo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXau:0 x11-libs/libXext:0 x11-libs/libXrender:0 x11-libs/libXtst:0 x11-libs/pango:0 x11-libs/xtrans:0 x11-misc/xdg-user-dirs:0 x11-misc/xdg-user-dirs-gtk:0 virtual/libintl:0 elibc_FreeBSD? ( dev-libs/libexecinfo:0 ) gnome-keyring? ( gnome-base/gnome-keyring:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-session-manager-1.6.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7eeef327a27550b65364288421c67de3
+_md5_=e41e5ccc80170345d6a76bd99e38c29e
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.6.2 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.6.2
index d5471c833dde..ead3326082ad 100644
--- a/metadata/md5-cache/mate-base/mate-settings-daemon-1.6.2
+++ b/metadata/md5-cache/mate-base/mate-settings-daemon-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=MATE Settings Daemon
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X debug libnotify policykit pulseaudio smartcard debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=mate-base/libmatekbd-1.6.1:0 >=mate-base/mate-desktop-1.6:0 media-libs/fontconfig:1.0 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( media-libs/libcanberra:0[gtk] >=media-sound/pulseaudio-0.9.15:0 ) !pulseaudio? ( >=media-libs/gstreamer-0.10.1.2:0.10 >=media-libs/gst-plugins-base-0.10.1.2:0.10 ) smartcard? ( >=dev-libs/nss-3.11.2:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-settings-daemon-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7263357ff4d7c5ad0b57b3a3c2dbc860
+_md5_=e8860c9bf83f7fdc5e29ff5d9b79919c
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-0.7.1 b/metadata/md5-cache/mate-extra/caja-dropbox-0.7.1
index 286dd1bd8637..fccc203f18e9 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-0.7.1
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Store, Sync and Share Files Online
 EAPI=5
 HOMEPAGE=http://www.dropbox.com/
 IUSE=debug debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.14:2 dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=mate-base/mate-file-manager-1.6:0 media-libs/fontconfig:1.0 media-libs/freetype:2 net-misc/dropbox:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.4/caja-dropbox-0.7.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=89130ea98c65f1945694a40a07ee827c
+_md5_=8d44cf1cb7e8fd7e07aa790124c0861d
diff --git a/metadata/md5-cache/mate-extra/mate-calc-1.6.1 b/metadata/md5-cache/mate-extra/mate-calc-1.6.1
index 0d1536fc5e77..60eed095b331 100644
--- a/metadata/md5-cache/mate-extra/mate-calc-1.6.1
+++ b/metadata/md5-cache/mate-extra/mate-calc-1.6.1
@@ -3,10 +3,10 @@ DEPEND=app-text/rarian:0 >=dev-libs/glib-2.30:2 dev-libs/atk:0 dev-libs/libxml2:
 DESCRIPTION=A calculator application for MATE
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=app-text/rarian:0 >=dev-libs/glib-2.30:2 dev-libs/atk:0 dev-libs/libxml2:2 >=x11-libs/gtk+-2.18:2 x11-libs/pango:0 virtual/libintl:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-calc-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=254dd40375d40be2d431bb80d772b9c8
+_md5_=7991987b870edd3375a3dc87f492ca58
diff --git a/metadata/md5-cache/mate-extra/mate-character-map-1.6.0 b/metadata/md5-cache/mate-extra/mate-character-map-1.6.0
index fb26317dc4e3..24ba106749f5 100644
--- a/metadata/md5-cache/mate-extra/mate-character-map-1.6.0
+++ b/metadata/md5-cache/mate-extra/mate-character-map-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Unicode character map viewer
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=cjk +introspection test debug python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.16.3:2 x11-libs/cairo:0 >=x11-libs/pango-1.2.1:0 >=x11-libs/gtk+-2.14:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-character-map-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=31c29f2081e1b61fe668a76626e77014
+_md5_=9dc7b03b8576f07c060c58adf0e9642c
diff --git a/metadata/md5-cache/mate-extra/mate-dialogs-1.6.2 b/metadata/md5-cache/mate-extra/mate-dialogs-1.6.2
index dad88e629aaf..99ea98c56efe 100644
--- a/metadata/md5-cache/mate-extra/mate-dialogs-1.6.2
+++ b/metadata/md5-cache/mate-extra/mate-dialogs-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Display MATE dialogs from the commandline and shell scripts
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=libnotify debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2
 RDEPEND=app-text/rarian:0 >=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11:0 virtual/libintl:0 libnotify? ( >=x11-libs/libnotify-0.7.0:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-dialogs-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=98b5210ffd993709fd0b4fb31fc44529
+_md5_=426339bbfdd4b58e2415e2a385c73749
diff --git a/metadata/md5-cache/mate-extra/mate-file-manager-image-converter-1.6.0 b/metadata/md5-cache/mate-extra/mate-file-manager-image-converter-1.6.0
index cc153cc8c1c7..377998ff8287 100644
--- a/metadata/md5-cache/mate-extra/mate-file-manager-image-converter-1.6.0
+++ b/metadata/md5-cache/mate-extra/mate-file-manager-image-converter-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Adds a 'Resize Images' item to the context menu for all images
 EAPI=5
 HOMEPAGE=http://www.mate-desktop.org
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=mate-base/mate-file-manager-1.6:0 >=x11-libs/gtk+-2.12 virtual/libintl:0 || ( media-gfx/imagemagick:0= media-gfx/graphicsmagick:0[imagemagick] )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-file-manager-image-converter-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d9c151934f82685f5933f8f4699bb211
+_md5_=5f9790782187ee316c95dd62713bc208
diff --git a/metadata/md5-cache/mate-extra/mate-file-manager-open-terminal-1.6.0 b/metadata/md5-cache/mate-extra/mate-file-manager-open-terminal-1.6.0
index e3efb212e20b..5310bd74790b 100644
--- a/metadata/md5-cache/mate-extra/mate-file-manager-open-terminal-1.6.0
+++ b/metadata/md5-cache/mate-extra/mate-file-manager-open-terminal-1.6.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.4:2 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-fil
 DESCRIPTION=Caja plugin for opening terminals
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.4:2 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-file-manager-1.6:0 virtual/libintl:0 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-file-manager-open-terminal-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ea01e4553cc87c23f62c56fda9815793
+_md5_=cc66b052053ba52ad672cc3c6cc236b3
diff --git a/metadata/md5-cache/mate-extra/mate-file-manager-sendto-1.6.0 b/metadata/md5-cache/mate-extra/mate-file-manager-sendto-1.6.0
index b9429aa32d63..e555635bd9de 100644
--- a/metadata/md5-cache/mate-extra/mate-file-manager-sendto-1.6.0
+++ b/metadata/md5-cache/mate-extra/mate-file-manager-sendto-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Caja extension for sending files to locations
 EAPI=5
 HOMEPAGE=http://www.mate-desktop.org
 IUSE=cdr gajim +mail pidgin upnp debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.60:0 >=dev-libs/glib-2.25.9:2 >=mate-base/mate-file-manager-1.6:0 >=sys-apps/dbus-1:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 virtual/libintl:0 cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 >=dev-libs/dbus-glib-0.60:0 ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-file-manager-sendto-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0cdcd63414270befda2c3b19e95aaf44
+_md5_=cae9a308aaba83c78d6547ad01083467
diff --git a/metadata/md5-cache/mate-extra/mate-file-manager-share-1.6.0 b/metadata/md5-cache/mate-extra/mate-file-manager-share-1.6.0
index 89c81c7925e7..15215c0dad3d 100644
--- a/metadata/md5-cache/mate-extra/mate-file-manager-share-1.6.0
+++ b/metadata/md5-cache/mate-extra/mate-file-manager-share-1.6.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.4:2 >=mate-base/mate-file-manager-1.6:0 x11-libs/gtk+:2
 DESCRIPTION=A Caja plugin to easily share folders over the SMB protocol
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.4:2 >=mate-base/mate-file-manager-1.6:0 x11-libs/gtk+:2 virtual/libintl:0 net-fs/samba:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-file-manager-share-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=10f15e633ec6e7361f439656c6b17c6d
+_md5_=3e3c6d1b9db730334cc1a72662d3ece0
diff --git a/metadata/md5-cache/mate-extra/mate-media-1.6.1 b/metadata/md5-cache/mate-extra/mate-media-1.6.1
index ffbba3f3ea4f..59416a0f3246 100644
--- a/metadata/md5-cache/mate-extra/mate-media-1.6.1
+++ b/metadata/md5-cache/mate-extra/mate-media-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Multimedia related programs for the MATE desktop
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=aac flac mp3 pulseaudio speex twolame vorbis debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2 GPL-2 FDL-1.1
 RDEPEND=app-text/rarian:0 dev-libs/libxml2:2 >=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.18:2 >=mate-base/mate-panel-1.6:0 >=mate-base/mate-desktop-1.6:0 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/libcanberra-0.13:0[gtk] >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1:0.10 >=dev-libs/libunique-1:1 x11-libs/cairo:0 x11-libs/pango:0 virtual/libintl:0 pulseaudio? ( >=media-sound/pulseaudio-0.9.16:0[glib] ) >=media-plugins/gst-plugins-meta-0.10:0.10[flac?,vorbis?] aac? ( >=media-plugins/gst-plugins-faac-0.10.23:0.10 >=media-plugins/gst-plugins-ffmpeg-0.10:0.10 ) mp3? ( >=media-libs/gst-plugins-ugly-0.10:0.10 >=media-plugins/gst-plugins-taglib-0.10.23:0.10 >=media-plugins/gst-plugins-lame-0.10:0.10 ) speex? ( >=media-plugins/gst-plugins-ogg-0.10.23:0.10 >=media-plugins/gst-plugins-speex-0.10.23:0.10 ) twolame? ( >=media-plugins/gst-plugins-taglib-0.10.23:0.10 >=media-plugins/gst-plugins-twolame-0.10:0.10 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-media-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=78d0e86cf9485c1078124b1667c3c479
+_md5_=f08ee6210c3a5c37a4fbd471ffdc7116
diff --git a/metadata/md5-cache/mate-extra/mate-polkit-1.6.1 b/metadata/md5-cache/mate-extra/mate-polkit-1.6.1
index 4203769e8f6b..31d3db23c4bd 100644
--- a/metadata/md5-cache/mate-extra/mate-polkit-1.6.1
+++ b/metadata/md5-cache/mate-extra/mate-polkit-1.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=A MATE specific DBUS session bus service that is used to bring up au
 EAPI=5
 HOMEPAGE=https://github.com/mate-desktop/mate-polkit
 IUSE=+introspection debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-auth/polkit-0.102:0[introspection?] >=x11-libs/gtk+-2.24:2[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.2:0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-polkit-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a2242db82fe9caeb71dd916de641be68
+_md5_=cd041b7dca69bdec5941d6059c801f01
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.6.3 b/metadata/md5-cache/mate-extra/mate-power-manager-1.6.3
index acb1d0fd2e8f..f05fad498f9f 100644
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.6.3
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop o
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=+applet gnome-keyring man policykit test unique
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=app-text/rarian:0 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.13:2 >=media-libs/libcanberra-0.10:0[gtk] >=sys-apps/dbus-1:0 >=sys-power/upower-0.9.1:0 >=x11-apps/xrandr-1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-2.17.7:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6:0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-3:0 ) unique? ( >=dev-libs/libunique-0.9.4:1 ) policykit? ( >=mate-extra/mate-polkit-1.6:0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-power-manager-1.6.3.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cd49eeee9fb5afe79bdc6806c0950076
+_md5_=401fc2a10f68df8fcd6990401b6ca3ca
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.6.1-r2 b/metadata/md5-cache/mate-extra/mate-screensaver-1.6.1-r2
index 9f3e07d7271c..1d67e0bf2587 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.6.1-r2
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.6.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop.
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X consolekit kernel_linux libnotify opengl pam systemd debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.15:2 >=mate-base/libmatekbd-1.6:0 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-menus-1.6:0 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/gtk+-2.11.5:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) !!<gnome-extra/gnome-screensaver-3:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-screensaver-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=be9f96cc337af944ca839c574f9e6b37
+_md5_=521028942de7f1339d42576109cde132
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.6.1 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.6.1
index 148862b6a61c..e20d8c644f0f 100644
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.6.1
+++ b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=MATE panel applet to display readings from hardware sensors
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=+dbus hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:0 ) )
 RDEPEND=app-text/rarian:0 >=dev-libs/glib-2.26:2 >=mate-base/mate-panel-1.6:0 >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 virtual/libintl:0 hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_fglrx? ( x11-drivers/ati-drivers:* ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0 media-video/nvidia-settings:0 ) )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-sensors-applet-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=55a97dd206968fe375d5e91d475c73c2
+_md5_=52d908853ef4d52f179d0c1ab59001bc
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.6.1 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.6.1
index 7a28a247e0ba..01ad674a95d6 100644
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.6.1
+++ b/metadata/md5-cache/mate-extra/mate-system-monitor-1.6.1
@@ -3,10 +3,10 @@ DEPEND=app-text/rarian:0 >=dev-cpp/glibmm-2.16:2 >=dev-cpp/gtkmm-2.22:2.4 >=dev-
 DESCRIPTION=The MATE System Monitor
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=app-text/rarian:0 >=dev-cpp/glibmm-2.16:2 >=dev-cpp/gtkmm-2.22:2.4 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.28:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/librsvg-2.12:2 >=sys-apps/dbus-0.7:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 >=x11-libs/libmatewnck-1.6:0 >=x11-themes/mate-icon-theme-1.6:0 virtual/libintl:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-system-monitor-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=09a865bd86c082ae9a5ae786f768ebdb
+_md5_=63bd6700cd646750c73b5df173bed6de
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.6.1 b/metadata/md5-cache/mate-extra/mate-user-share-1.6.1
index 317137b79629..5aec2439f2af 100644
--- a/metadata/md5-cache/mate-extra/mate-user-share-1.6.1
+++ b/metadata/md5-cache/mate-extra/mate-user-share-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Personal file sharing for the MATE desktop
 EAPI=5
 HOMEPAGE=http://www.mate-desktop.org/
 IUSE=X bluetooth
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=app-mobilephone/obex-data-server-0.4:0 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=dev-libs/libunique-1:1 >=mate-base/mate-file-manager-1.6:0 media-libs/libcanberra:0[gtk] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2.14:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 >=www-apache/mod_dnssd-0.6:0 =www-servers/apache-2.2*:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] virtual/libintl:0 bluetooth? ( >=net-wireless/mate-bluetooth-1.6:0 >=net-wireless/bluez-4.18:0= )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-user-share-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5c4a332ad107a3e908e5eb15b2a798db
+_md5_=59faf7db80c7e357a4b8c330e2665554
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.6.1 b/metadata/md5-cache/mate-extra/mate-utils-1.6.1
index 9ea425cb0cc7..434a4c69faeb 100644
--- a/metadata/md5-cache/mate-extra/mate-utils-1.6.1
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for the MATE desktop
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X applet ipv6 test debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.20:2 >=gnome-base/libgtop-2.12:2 >=media-libs/libcanberra-0.4:0[gtk] sys-libs/zlib:0 >=x11-libs/gtk+-2.20:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-utils-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ff150a546533609672aed227aefd1935
+_md5_=542dcb69867092d8789ca61d18c808ee
diff --git a/metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1 b/metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1
index c32082291e0c..e4efac628926 100644
--- a/metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1
+++ b/metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1
@@ -3,10 +3,10 @@ DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=WenQuanYi Bitmap Song CJK font
 HOMEPAGE=http://wenq.org/wqy2/index.cgi?Home
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/wqy/wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	font	37271e0911f39dd15a28adcaf94f6956	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=54df35f7f819fa1b8c9dc3ce3b4a3205
+_md5_=fff6af7b0b1f0589ac74d7c59bc91153
diff --git a/metadata/md5-cache/media-gfx/gif2apng-1.9 b/metadata/md5-cache/media-gfx/gif2apng-1.9
new file mode 100644
index 000000000000..7dd225343e65
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gif2apng-1.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/zlib app-arch/unzip
+DESCRIPTION=create an APNG from a GIF
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/gif2apng/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/gif2apng/1.9/gif2apng-1.9-src.zip
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=575f3001a9d6068eec2e167ad5dfbb53
diff --git a/metadata/md5-cache/media-gfx/gifsicle-1.78 b/metadata/md5-cache/media-gfx/gifsicle-1.78
index a98f8bae221c..e12580c8887a 100644
--- a/metadata/md5-cache/media-gfx/gifsicle-1.78
+++ b/metadata/md5-cache/media-gfx/gifsicle-1.78
@@ -4,9 +4,9 @@ DESCRIPTION=A command-line tool for creating, editing, and getting information a
 EAPI=5
 HOMEPAGE=http://www.lcdf.org/~eddietwo/gifsicle/
 IUSE=X
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2 MIT
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=http://www.lcdf.org/~eddietwo/gifsicle/gifsicle-1.78.tar.gz
-_md5_=88de4b07af5027c10e4f0da3fd4b1bc4
+_md5_=12b38e26eaaf998f1bf54a5ca602c744
diff --git a/metadata/md5-cache/media-gfx/gifsicle-1.83 b/metadata/md5-cache/media-gfx/gifsicle-1.83
new file mode 100644
index 000000000000..6ac76a8238f6
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gifsicle-1.83
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) X? ( x11-proto/xproto )
+DESCRIPTION=A command-line tool for creating, editing, and getting information about GIF images and animations
+EAPI=5
+HOMEPAGE=http://www.lcdf.org/~eddietwo/gifsicle/
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2 MIT
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt )
+SLOT=0
+SRC_URI=http://www.lcdf.org/~eddietwo/gifsicle/gifsicle-1.83.tar.gz
+_md5_=82af362ac256dd93107aafc4d3c38fe3
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.2.7 b/metadata/md5-cache/media-gfx/gthumb-3.2.7
index cb78ab4be6e5..51bb746517f2 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.2.7
+++ b/metadata/md5-cache/media-gfx/gthumb-3.2.7
@@ -4,10 +4,10 @@ DESCRIPTION=Image viewer and browser for Gnome
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/gthumb
 IUSE=cdr exif gstreamer http jpeg json libsecret raw slideshow svg tiff test webkit webp debug
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.34.0:2 >=x11-libs/gtk+-3.4.0:3 media-libs/libpng:0= sys-libs/zlib x11-libs/libICE x11-libs/libSM cdr? ( >=app-cdr/brasero-3.2 ) exif? ( >=media-gfx/exiv2-0.21:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) http? ( >=net-libs/libsoup-gnome-2.36:2.4 ) jpeg? ( virtual/jpeg:0= ) json? ( >=dev-libs/json-glib-0.15.0 ) libsecret? ( >=app-crypt/libsecret-0.11 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-1:1.0 ) svg? ( >=gnome-base/librsvg-2.34 ) tiff? ( media-libs/tiff:= ) raw? ( >=media-libs/libopenraw-0.0.8:= ) !raw? ( media-gfx/dcraw ) webkit? ( >=net-libs/webkit-gtk-1.10.0:3 ) webp? ( >=media-libs/libwebp-0.2.0 ) >=gnome-base/gsettings-desktop-schemas-0.1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.2/gthumb-3.2.7.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=032947231cd7a2259d14a192e49ff00c
+_md5_=44fe4b6a4e40ac854848b6b10e85ecf0
diff --git a/metadata/md5-cache/media-gfx/mate-image-viewer-1.6.2 b/metadata/md5-cache/media-gfx/mate-image-viewer-1.6.2
index aff2fe0855ec..1f4e2fec556d 100644
--- a/metadata/md5-cache/media-gfx/mate-image-viewer-1.6.2
+++ b/metadata/md5-cache/media-gfx/mate-image-viewer-1.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=The MATE image viewer
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=X dbus exif jpeg lcms python svg tiff xmp debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.25.9:2 >=dev-libs/libxml2-2:2 >=mate-base/mate-desktop-1.6:0 sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[jpeg?,tiff?] >=x11-libs/gtk+-2.18:2 x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 >=x11-themes/mate-icon-theme-1.6:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:0 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-2.15.1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtk-2.13:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) svg? ( >=gnome-base/librsvg-2.26:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 )
 REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-image-viewer-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=71d942d03d24ecce9a943de31b869111
+_md5_=8e504c7ed38b36bc8daa08cd633f2eb2
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.15.1 b/metadata/md5-cache/media-gfx/shotwell-0.15.1
index 7b0d4f388e28..978ed4f316d5 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.15.1
+++ b/metadata/md5-cache/media-gfx/shotwell-0.15.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/sqlite-3.5.9:3 >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.30.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 >=dev-util/desktop-file-utils-0.13 gnome-base/dconf >=media-libs/gexiv2-0.4.90 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.4.2:= >=media-libs/libraw-0.13.2:= >=net-libs/libsoup-2.26.0:2.4 >=net-libs/rest-0.7:0.7 >=net-libs/webkit-gtk-1.4:3 >=virtual/udev-145[gudev] >=x11-libs/gtk+-3.6.0:3
 SLOT=0
 SRC_URI=http://www.yorba.org/download/shotwell/stable/shotwell-0.15.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3ab792a140b4dac966fcbe5d3e323f5c
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.18.0 b/metadata/md5-cache/media-gfx/shotwell-0.18.0
index aef49bf4f999..86a753443b97 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.18.0
+++ b/metadata/md5-cache/media-gfx/shotwell-0.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-text/gnome-doc-utils >=dev-db/sqlite-3.5.9:3 >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.30.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 >=dev-util/desktop-file-utils-0.13 gnome-base/dconf >=media-libs/gexiv2-0.4.90 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.4.2:= >=media-libs/libraw-0.13.2:= >=net-libs/libsoup-2.26.0:2.4 >=net-libs/rest-0.7:0.7 >=net-libs/webkit-gtk-1.4:3 >=virtual/udev-145[gudev] >=x11-libs/gtk+-3.6.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.18/shotwell-0.18.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e55fb4dcaf74d03bb4a8a1dc8ac7c5b8
diff --git a/metadata/md5-cache/media-libs/babl-9999 b/metadata/md5-cache/media-libs/babl-9999
index 7b71ef1ea2e8..8f8c8a266434 100644
--- a/metadata/md5-cache/media-libs/babl-9999
+++ b/metadata/md5-cache/media-libs/babl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=4
 HOMEPAGE=http://www.gegl.org/babl/
@@ -7,5 +7,5 @@ IUSE=altivec +introspection sse mmx vala
 LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 )
 SLOT=0
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=a56ec76f8e807004afd96b4282a06f34
diff --git a/metadata/md5-cache/media-libs/flac-1.3.0 b/metadata/md5-cache/media-libs/flac-1.3.0
index b945df277ae2..95a097d9a9ac 100644
--- a/metadata/md5-cache/media-libs/flac-1.3.0
+++ b/metadata/md5-cache/media-libs/flac-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=free lossless audio encoder and decoder
 EAPI=5
 HOMEPAGE=http://flac.sourceforge.net
 IUSE=3dnow altivec +cxx debug ogg sse static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=aceb905e3c62b720b1fe044fc614a41d
+_md5_=ed70f78e0fb9035c8327ed6cfd453106
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 15f14225b52d..4b8c082bfae7 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( virtual/ffmpeg ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( virtual/ffmpeg ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -7,5 +7,5 @@ IUSE=cairo debug ffmpeg introspection jpeg jpeg2k lensfun mmx openexr png raw sd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( virtual/ffmpeg ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=a63cc16005a626b25ebe99413cde63aa
diff --git a/metadata/md5-cache/media-libs/giflib-5.0.6 b/metadata/md5-cache/media-libs/giflib-5.0.6
new file mode 100644
index 000000000000..0a3ea653e383
--- /dev/null
+++ b/metadata/md5-cache/media-libs/giflib-5.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=Library to handle, display and manipulate GIF images
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/giflib/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+LICENSE=MIT
+RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
+SLOT=0/6
+SRC_URI=mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=a2f320902698405ba138903ab49dd10c
diff --git a/metadata/md5-cache/media-libs/grilo-0.2.10 b/metadata/md5-cache/media-libs/grilo-0.2.10
index aa247e10aeb3..a4267c375639 100644
--- a/metadata/md5-cache/media-libs/grilo-0.2.10
+++ b/metadata/md5-cache/media-libs/grilo-0.2.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] ) ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-lang/python-2.6.8-r3:2.6 dev-python/pygobject:2[python_targets_python2_6(-),python_single_target_python2_6(+)] dev-python/pygobject:3[python_targets_python2_6(-),python_single_target_python2_6(+)] ) ) media-plugins/grilo-plugins:0.2 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] ) ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-lang/python-2.6.8-r3:2.6 dev-python/pygobject:2[python_targets_python2_6(-),python_single_target_python2_6(+)] dev-python/pygobject:3[python_targets_python2_6(-),python_single_target_python2_6(+)] ) ) media-plugins/grilo-plugins:0.2 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=gtk examples +introspection +network playlist test vala
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
 REQUIRED_USE=test? ( introspection )
 SLOT=0.2/1
 SRC_URI=mirror://gnome/sources/grilo/0.2/grilo-0.2.10.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=86ffcbc36eca73457c8fe151424c00ee
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=09f10f5868e974129596bf2adad63a6d
diff --git a/metadata/md5-cache/media-libs/grilo-0.2.9 b/metadata/md5-cache/media-libs/grilo-0.2.9
index d6772cfb4ad4..b50734e009a1 100644
--- a/metadata/md5-cache/media-libs/grilo-0.2.9
+++ b/metadata/md5-cache/media-libs/grilo-0.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] ) ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-lang/python-2.6.8-r3:2.6 dev-python/pygobject:2[python_targets_python2_6(-),python_single_target_python2_6(+)] dev-python/pygobject:3[python_targets_python2_6(-),python_single_target_python2_6(+)] ) ) media-plugins/grilo-plugins:0.2 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] ) ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-lang/python-2.6.8-r3:2.6 dev-python/pygobject:2[python_targets_python2_6(-),python_single_target_python2_6(+)] dev-python/pygobject:3[python_targets_python2_6(-),python_single_target_python2_6(+)] ) ) media-plugins/grilo-plugins:0.2 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11
 REQUIRED_USE=test? ( introspection )
 SLOT=0.2/1
 SRC_URI=mirror://gnome/sources/grilo/0.2/grilo-0.2.9.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c561aa52d02ee395c8a16522137e8adc
diff --git a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.2 b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.2
index 3e459490541c..b5e4d234f3a5 100644
--- a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.2
+++ b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Library providing DLNA-related functionality for MediaServers
 EAPI=5
 HOMEPAGE=http://gupnp.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gupnp-dlna/0.10/gupnp-dlna-0.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f8266febb40bf1542ae1bb6d2b68e9d7
diff --git a/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r4 b/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r4
new file mode 100644
index 000000000000..181dd1784d3b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=CMT (computer music toolkit) LADSPA library plugins
+EAPI=5
+HOMEPAGE=http://www.ladspa.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://www.ladspa.org/download/cmt_src_1.16.tgz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=54196a71918fd18458994da7787f4dae
diff --git a/metadata/md5-cache/media-libs/lcms-1.19-r1 b/metadata/md5-cache/media-libs/lcms-1.19-r1
index a3616f01a63c..194a27c655e2 100644
--- a/metadata/md5-cache/media-libs/lcms-1.19-r1
+++ b/metadata/md5-cache/media-libs/lcms-1.19-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg:0 ) zlib? ( sys-libs/zlib ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python? ( >=dev-lang/swig-1.3.31 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg:0 ) zlib? ( sys-libs/zlib ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python? ( >=dev-lang/swig-1.3.31 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=5
 HOMEPAGE=http://www.littlecms.com/
-IUSE=jpeg python static-libs tiff zlib python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=jpeg python static-libs tiff zlib python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg:0 ) zlib? ( sys-libs/zlib ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] )
+RDEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg:0 ) zlib? ( sys-libs/zlib ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
 SLOT=0
 SRC_URI=http://www.littlecms.com/lcms-1.19.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0e5d6a084e6dff45e8d389d8a19be99c
+_md5_=53d0c86a0ff12d44c773226b09aebcae
diff --git a/metadata/md5-cache/media-libs/lcms-2.6 b/metadata/md5-cache/media-libs/lcms-2.6
new file mode 100644
index 000000000000..a8a6b4ec75d0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lcms-2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=A lightweight, speed optimized color management engine
+EAPI=5
+HOMEPAGE=http://www.littlecms.com/
+IUSE=doc jpeg static-libs +threads test tiff zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=2
+SRC_URI=mirror://sourceforge/lcms/lcms2-2.6.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=e2214de157dd8abc3f23601926f44fa2
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.7 b/metadata/md5-cache/media-libs/libchamplain-0.12.7
index 233f12d69444..7789db38a5fd 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.7
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/memphis:0.2[introspection?] net-libs/libsoup-gnome:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection ) dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/memphis:0.2[introspection?] net-libs/libsoup-gnome:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection ) dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Clutter based world map renderer
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/libchamplain/
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspect
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.7.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8f1d1fcbb6b66697be0ccf3806795e1a
diff --git a/metadata/md5-cache/media-libs/libdvdnav-4.2.1 b/metadata/md5-cache/media-libs/libdvdnav-4.2.1
index e49d4b70ef20..ea85c312ded4 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-4.2.1
+++ b/metadata/md5-cache/media-libs/libdvdnav-4.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for DVD navigation tools
 EAPI=5
 HOMEPAGE=http://dvdnav.mplayerhq.hu/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3f8cafb4ac0bd1ad0c248b630a281b98
+_md5_=a6caa4467e2a6b9d725e438e15d5be97
diff --git a/metadata/md5-cache/media-libs/libdvdread-4.2.1 b/metadata/md5-cache/media-libs/libdvdread-4.2.1
index e939970b6d2b..2cb60cdb822a 100644
--- a/metadata/md5-cache/media-libs/libdvdread-4.2.1
+++ b/metadata/md5-cache/media-libs/libdvdread-4.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for DVD navigation tools
 EAPI=5
 HOMEPAGE=http://dvdnav.mplayerhq.hu/
 IUSE=+css abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<media-libs/libdvdnav-4.2.1 css? ( media-libs/libdvdcss[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e3fab8c5a5fb9484656ad5dda2fc91ee
+_md5_=2f9fd2d2c8f04e4a0d31faf790414275
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20140121 b/metadata/md5-cache/media-libs/libhdhomerun-20140121
new file mode 100644
index 000000000000..dfd06ce929f1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libhdhomerun-20140121
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=SiliconDust HDHomeRun Utilties
+EAPI=5
+HOMEPAGE=http://www.silicondust.com/support/hdhomerun/downloads/linux/
+KEYWORDS=~amd64
+LICENSE=LGPL-3+
+SLOT=0
+SRC_URI=http://download.silicondust.com/hdhomerun/libhdhomerun_20140121.tgz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=59f2ccb0306174e658d6ff4ded69baf9
diff --git a/metadata/md5-cache/media-libs/libmediaart-0.4.0 b/metadata/md5-cache/media-libs/libmediaart-0.4.0
index a5120a7cf4bf..6a767a096f2e 100644
--- a/metadata/md5-cache/media-libs/libmediaart-0.4.0
+++ b/metadata/md5-cache/media-libs/libmediaart-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.35.1:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) qt4? ( dev-qt/qtgui:4 ) qt5? ( dev-qt/qtgui:5 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.35.1:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) qt4? ( dev-qt/qtgui:4 ) qt5? ( dev-qt/qtgui:5 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Manages, extracts and handles media art caches
 EAPI=5
 HOMEPAGE=https://github.com/curlybeast/libmediaart
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.35.1:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspec
 REQUIRED_USE=?? ( gtk qt4 qt5 ) vala? ( introspection )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/libmediaart/0.4/libmediaart-0.4.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=48d93756c0dba43c5758a100d98e1492
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-1.8.0 b/metadata/md5-cache/media-libs/libsoundtouch-1.8.0
index a2b243a8f64d..4dc68df54e81 100644
--- a/metadata/md5-cache/media-libs/libsoundtouch-1.8.0
+++ b/metadata/md5-cache/media-libs/libsoundtouch-1.8.0
@@ -4,9 +4,9 @@ DESCRIPTION=Audio processing library for changing tempo, pitch and playback rate
 EAPI=5
 HOMEPAGE=http://www.surina.net/soundtouch/
 IUSE=sse2 static-libs
-KEYWORDS=amd64 ~arm hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.surina.net/soundtouch/soundtouch-1.8.0.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ef19c05656acbc28d60c637d620503ae
+_md5_=a3703784332de0888023113e714d26fd
diff --git a/metadata/md5-cache/media-libs/memphis-0.2.3 b/metadata/md5-cache/media-libs/memphis-0.2.3
index f7e7c7280611..a0536a7e34e0 100644
--- a/metadata/md5-cache/media-libs/memphis-0.2.3
+++ b/metadata/md5-cache/media-libs/memphis-0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection ) vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) ) dev-util/gtk-doc !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) ) dev-util/gtk-doc !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A map-rendering application and a library for OpenStreetMap
 EAPI=4
 HOMEPAGE=http://trac.openstreetmap.ch/trac/memphis/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection )
 SLOT=0.2
 SRC_URI=http://wenner.ch/files/public/mirror/memphis/memphis-0.2.3.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=9d694ab28c2c3c1c93f5175e0b08884a
diff --git a/metadata/md5-cache/media-libs/openal-1.15.1-r2 b/metadata/md5-cache/media-libs/openal-1.15.1-r2
index fa6533031baf..3d57dfd5a4e7 100644
--- a/metadata/md5-cache/media-libs/openal-1.15.1-r2
+++ b/metadata/md5-cache/media-libs/openal-1.15.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A software implementation of the OpenAL 3D audio API
 EAPI=5
 HOMEPAGE=http://kcat.strangesoft.net/openal.html
 IUSE=alsa coreaudio debug neon oss portaudio pulseaudio sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2
 _eclasses_=cmake-multilib	08126500411a2fc0fb106455d60e0c60	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1da5defd79124a3d09b3e5916760d5ec
+_md5_=91d816002d20efbe657501f4e341d8e5
diff --git a/metadata/md5-cache/media-libs/opusfile-0.5 b/metadata/md5-cache/media-libs/opusfile-0.5
index 978855eec65f..169e93fd4d2a 100644
--- a/metadata/md5-cache/media-libs/opusfile-0.5
+++ b/metadata/md5-cache/media-libs/opusfile-0.5
@@ -4,10 +4,10 @@ DESCRIPTION=A high-level decoding and seeking API for .opus files
 EAPI=5
 HOMEPAGE=http://www.opus-codec.org/
 IUSE=doc fixed-point +float +http static-libs
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
 LICENSE=BSD
 RDEPEND=media-libs/libogg media-libs/opus http? ( dev-libs/openssl )
 REQUIRED_USE=^^ ( fixed-point float )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opusfile-0.5.tar.gz
-_md5_=645f2e8a576970c55f44eeed0cb20df0
+_md5_=b5c8be1f8d35d0ab8e5fedd5e55badaa
diff --git a/metadata/md5-cache/media-libs/qt-gstreamer-0.10.3 b/metadata/md5-cache/media-libs/qt-gstreamer-0.10.3
index 0d63a389b7d3..b1a33ba1eaab 100644
--- a/metadata/md5-cache/media-libs/qt-gstreamer-0.10.3
+++ b/metadata/md5-cache/media-libs/qt-gstreamer-0.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=QtGStreamer provides C++ bindings for GStreamer with a Qt-style API.
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/wiki/QtGStreamer
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=dev-libs/boost-1.40:= >=dev-util/boost-build-1.40 >=media-libs/gstreamer-0.10.33:0.10 >=media-libs/gst-plugins-base-0.10.33:0.10 >=dev-qt/qtcore-4.7.0:4 >=dev-qt/qtdeclarative-4.7.0:4 >=dev-qt/qtgui-4.7.0:4 >=dev-qt/qtopengl-4.7.0:4
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-0.10.3.tar.bz2
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7aa6d388cb156392207beb31bc8d0431
+_md5_=f071a668b177f73bb78b884f7fcaea14
diff --git a/metadata/md5-cache/media-libs/sbc-1.2 b/metadata/md5-cache/media-libs/sbc-1.2
index e4975f32aa89..83bcac0c5450 100644
--- a/metadata/md5-cache/media-libs/sbc-1.2
+++ b/metadata/md5-cache/media-libs/sbc-1.2
@@ -4,10 +4,10 @@ DESCRIPTION=An audio codec to connect bluetooth high quality audio devices like
 EAPI=5
 HOMEPAGE=http://git.kernel.org/?p=bluetooth/sbc.git http://www.bluez.org/sbc-10/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=amd64 arm hppa ~ia64 ppc ppc64 ~x86
+KEYWORDS=amd64 arm hppa ~ia64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/bluetooth/sbc-1.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0e9be3cf9443ea29e6fb9282a477131d
+_md5_=51a1ee04f7a18bebcb0479561456a51b
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
new file mode 100644
index 000000000000..505ef62b824e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/libsdl-1.2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] flac? ( media-libs/flac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) midi? ( fluidsynth? ( media-sound/fluidsynth[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( media-libs/libmad[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) smpeg? ( >=media-libs/smpeg-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) mod? ( modplug? ( media-libs/libmodplug[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mikmod? ( >=media-libs/libmikmod-3.1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-sdl-20140406-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=Simple Direct Media Layer Mixer Library
+EAPI=5
+HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
+IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl-1.2.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] flac? ( media-libs/flac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) midi? ( fluidsynth? ( media-sound/fluidsynth[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( media-libs/libmad[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) smpeg? ( >=media-libs/smpeg-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) mod? ( modplug? ( media-libs/libmodplug[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mikmod? ( >=media-libs/libmikmod-3.1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-sdl-20140406-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
+REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=f6d2205b3bce9cc8708f514031d1fec8
diff --git a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.0-r1 b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.0-r1
new file mode 100644
index 000000000000..b8fb94ea9510
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] flac? ( media-libs/flac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) midi? ( fluidsynth? ( media-sound/fluidsynth[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( media-libs/libmad[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) smpeg? ( media-libs/smpeg2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) mod? ( modplug? ( media-libs/libmodplug[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mikmod? ( media-libs/libmikmod[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) vorbis? ( tremor? ( media-libs/tremor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) !tremor? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=Simple Direct Media Layer Mixer Library
+EAPI=5
+HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
+IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] flac? ( media-libs/flac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) midi? ( fluidsynth? ( media-sound/fluidsynth[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( media-libs/libmad[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) smpeg? ( media-libs/smpeg2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) mod? ( modplug? ( media-libs/libmodplug[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mikmod? ( media-libs/libmikmod[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) vorbis? ( tremor? ( media-libs/tremor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) !tremor? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) )
+REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod ) tremor? ( vorbis )
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=fa52b97248e36961a4fd26c45bb94ce0
diff --git a/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
index c3a29dda0bd3..d9d5e873f500 100644
--- a/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/dbus-glib >=media-sound/gmpc-11.8.16 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) virtual/pkgconfig
+DEPEND=dev-libs/dbus-glib >=media-sound/gmpc-11.8.16 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig
 DESCRIPTION=Bind multimedia keys via gnome settings daemon
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/Plugins
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/dbus-glib >=media-sound/gmpc-11.8.16
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-mmkeys-11.8.16.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=0afbfb42b4c8faea3e936572e278b893
diff --git a/metadata/md5-cache/media-radio/fldigi-3.21.82 b/metadata/md5-cache/media-radio/fldigi-3.21.82
new file mode 100644
index 000000000000..29da8452b8e1
--- /dev/null
+++ b/metadata/md5-cache/media-radio/fldigi-3.21.82
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=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 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+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
+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
diff --git a/metadata/md5-cache/media-sound/fluidsynth-1.1.6-r1 b/metadata/md5-cache/media-sound/fluidsynth-1.1.6-r1
new file mode 100644
index 000000000000..cccdfdd3160f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/fluidsynth-1.1.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.6.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] lash? ( >=media-sound/lash-0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) jack? ( media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=media-libs/ladspa-cmt-1.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) readline? ( sys-libs/readline[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) sndfile? ( >=media-libs/libsndfile-1.0.18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=Fluidsynth is a software real-time synthesizer based on the Soundfont 2 specifications.
+EAPI=5
+HOMEPAGE=http://www.fluidsynth.org/
+IUSE=alsa dbus debug examples jack ladspa lash portaudio pulseaudio readline sndfile abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.6.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] lash? ( >=media-sound/lash-0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) jack? ( media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=media-libs/ladspa-cmt-1.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) readline? ( sys-libs/readline[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) sndfile? ( >=media-libs/libsndfile-1.0.18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] )
+SLOT=0
+SRC_URI=mirror://sourceforge/fluidsynth/fluidsynth-1.1.6.tar.gz
+_eclasses_=cmake-multilib	08126500411a2fc0fb106455d60e0c60	cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=5c518cca13fd9d98a9588c2d9a364275
diff --git a/metadata/md5-cache/media-sound/fmtools-2.0.7 b/metadata/md5-cache/media-sound/fmtools-2.0.7
index fc8c6b45ded2..22f478c5f748 100644
--- a/metadata/md5-cache/media-sound/fmtools-2.0.7
+++ b/metadata/md5-cache/media-sound/fmtools-2.0.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A collection of programs for controlling v4l radio card drivers
 EAPI=5
 HOMEPAGE=http://benpfaff.org/fmtools/
-KEYWORDS=amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://benpfaff.org/fmtools/fmtools-2.0.7.tar.gz
-_md5_=004e773dd4fe71c2fb6656c61a0a98f4
+_md5_=75e807d8f1ae8cd417e5f794700e60b3
diff --git a/metadata/md5-cache/media-sound/gmpc-11.8.16 b/metadata/md5-cache/media-sound/gmpc-11.8.16
index bb68f8b2fce0..f97643ee1245 100644
--- a/metadata/md5-cache/media-sound/gmpc-11.8.16
+++ b/metadata/md5-cache/media-sound/gmpc-11.8.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) app-text/gnome-doc-utils >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) app-text/gnome-doc-utils >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A GTK+2 client for the Music Player Daemon
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=2d00bc0d9946ed688183ec6029153aa6
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.10.4 b/metadata/md5-cache/media-sound/gnome-music-3.10.4
index 54f4680f78eb..c968dc0419af 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.10.4
+++ b/metadata/md5-cache/media-sound/gnome-music-3.10.4
@@ -4,11 +4,11 @@ DESCRIPTION=Music management for Gnome
 EAPI=5
 HOMEPAGE=http://wiki.gnome.org/Apps/Music
 IUSE=python_single_target_python3_2 +python_single_target_python3_3 python_targets_python3_2 python_targets_python3_3 python_single_target_python3_2 python_single_target_python3_3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9 >=media-libs/grilo-0.2.6:0.2[introspection] >=x11-libs/gtk+-3.9:3[introspection] app-misc/tracker[introspection(+)] || ( app-misc/tracker[gstreamer] app-misc/tracker[xine] ) dev-python/pygobject:3[cairo,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] dev-python/dbus-python[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.2[tracker]
 REQUIRED_USE=python_single_target_python3_2? ( python_targets_python3_2 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python3_2 python_single_target_python3_3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/3.10/gnome-music-3.10.4.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c3de040e889021f5815dede1e0f20a34
+_md5_=2832aaee817493d3b63b90551a823852
diff --git a/metadata/md5-cache/media-sound/lash-0.5.4-r2 b/metadata/md5-cache/media-sound/lash-0.5.4-r2
new file mode 100644
index 000000000000..af4376719478
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lash-0.5.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libxml2 media-sound/jack-audio-connection-kit >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) || ( sys-libs/readline dev-libs/libedit ) virtual/pkgconfig python? ( >=dev-lang/swig-1.3.40 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=LASH Audio Session Handler
+EAPI=5
+HOMEPAGE=http://www.nongnu.org/lash/
+IUSE=alsa debug gtk python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 media-sound/jack-audio-connection-kit >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) || ( sys-libs/readline dev-libs/libedit )
+REQUIRED_USE=python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=mirror://nongnu/lash/lash-0.5.4.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=3c7043bc085435d5601301c28ca826fa
diff --git a/metadata/md5-cache/media-sound/pulseaudio-5.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-5.0-r1
index 56046f2541a1..3586171c9197 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-5.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-5.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=5
 HOMEPAGE=http://www.pulseaudio.org/
 IUSE=+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd system-wide tcpd test +udev +webrtc-aec +X xen abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] )
 RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] X? ( >=x11-libs/libX11-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( net-wireless/bluez:= >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) webrtc-aec? ( media-libs/webrtc-audio-processing ) xen? ( app-emulation/xen-tools ) systemd? ( sys-apps/systemd:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) dev-libs/json-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) >=sys-devel/libtool-2.4.2 equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( net-wireless/bluez:= ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-5.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4ddf78087b8aaf110adcffb064c75daf
+_md5_=62f769b59ad3d7956d09b84854bf9652
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.0.2 b/metadata/md5-cache/media-sound/rhythmbox-3.0.2
index 5eb40005237c..8580c1916776 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.0.2
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Music management and playback software for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
 IUSE=cdr daap dbus +libsecret html ipod libnotify lirc mtp nsplugin +python test +udev upnp-av visualizer webkit zeitgeist python_single_target_python3_2 +python_single_target_python3_3 python_targets_python3_2 python_targets_python3_3 python_single_target_python3_2 python_single_target_python3_3 test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34.0:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-3.2.0 >=net-libs/libsoup-2.34.0:2.4 media-libs/gst-plugins-base:1.0[introspection] media-libs/gstreamer:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib visualizer? ( >=media-libs/clutter-1.8:1.0 >=media-libs/clutter-gst-1.9.92:2.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 media-plugins/gst-plugins-libvisual:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 media-plugins/gst-plugins-soup:1.0 ) libsecret? ( >=app-crypt/libsecret-0.14 ) html? ( >=net-libs/webkit-gtk-1.10:3 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( >=dev-python/pygobject-3.0:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) udev? ( virtual/udev[gudev] ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) zeitgeist? ( gnome-extra/zeitgeist ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/gnome-icon-theme-symbolic upnp-av? ( >=media-libs/grilo-0.2:0.2 >=media-plugins/grilo-plugins-0.2:0.2[upnp-av] ) python? ( x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) libsecret? ( >=app-crypt/libsecret-0.14[introspection] ) webkit? ( dev-python/mako[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] >=net-libs/webkit-gtk-1.10:3[introspection] ) )
 REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) webkit? ( python ) python? ( python_single_target_python3_2? ( python_targets_python3_2 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python3_2 python_single_target_python3_3 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.0/rhythmbox-3.0.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0367bd41fdd4919e1ccfde0e9bf7174f
+_md5_=3691abcf5a692e5deb64162d9c9b26db
diff --git a/metadata/md5-cache/media-sound/xnoise-9999 b/metadata/md5-cache/media-sound/xnoise-9999
index 79e70f961b8a..b4d297b5bcb9 100644
--- a/metadata/md5-cache/media-sound/xnoise-9999
+++ b/metadata/md5-cache/media-sound/xnoise-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.34:2 gnome-base/librsvg:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 dev-db/sqlite:3 >=media-libs/libtaginfo-0.2.0 x11-libs/cairo x11-libs/libX11 ayatana? ( dev-libs/libappindicator:3 ) lastfm? ( net-libs/libsoup:2.4 ) lyrics? ( net-libs/libsoup:2.4 dev-libs/libxml2:2 ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/intltool virtual/pkgconfig gnome-base/gnome-common:3 >=sys-devel/autoconf-2.67:2.5 sys-devel/gettext >=sys-apps/sed-4 dev-vcs/git
+DEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.34:2 gnome-base/librsvg:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 dev-db/sqlite:3 >=media-libs/libtaginfo-0.2.0 x11-libs/cairo x11-libs/libX11 ayatana? ( dev-libs/libappindicator:3 ) lastfm? ( net-libs/libsoup:2.4 ) lyrics? ( net-libs/libsoup:2.4 dev-libs/libxml2:2 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/intltool virtual/pkgconfig gnome-base/gnome-common:3 >=sys-devel/autoconf-2.67:2.5 sys-devel/gettext >=sys-apps/sed-4 dev-vcs/git
 DESCRIPTION=A media player for Gtk+ with a slick GUI, great speed and lots of features
 EAPI=4
 HOMEPAGE=http://www.xnoise-media-player.com/
@@ -7,5 +7,5 @@ IUSE=ayatana +lastfm +lyrics
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.34:2 gnome-base/librsvg:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 dev-db/sqlite:3 >=media-libs/libtaginfo-0.2.0 x11-libs/cairo x11-libs/libX11 ayatana? ( dev-libs/libappindicator:3 ) lastfm? ( net-libs/libsoup:2.4 ) lyrics? ( net-libs/libsoup:2.4 dev-libs/libxml2:2 )
 SLOT=0
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=f6748f2737c38e23b47b095905bf1da7
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.2.0 b/metadata/md5-cache/media-sound/yoshimi-1.2.0
new file mode 100644
index 000000000000..fbcee0c53223
--- /dev/null
+++ b/metadata/md5-cache/media-sound/yoshimi-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/mini-xml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/zlib x11-libs/cairo x11-libs/fltk:1[opengl] dev-libs/boost virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A software synthesizer based on ZynAddSubFX
+EAPI=5
+HOMEPAGE=http://yoshimi.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/mini-xml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/zlib x11-libs/cairo x11-libs/fltk:1[opengl]
+SLOT=0
+SRC_URI=mirror://sourceforge/yoshimi/yoshimi-1.2.0.tar.bz2
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=9c87badb7f09d3210d95ccb24b834d24
diff --git a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20140322 b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20140322
new file mode 100644
index 000000000000..12d11e6a057c
--- /dev/null
+++ b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20140322
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD
+EAPI=5
+HOMEPAGE=http://powarman.dyndns.org/hgwebdir.cgi/v4l-dvb-saa716x/
+IUSE=+firmware kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=firmware? ( sys-firmware/tt-s2-6400-firmware ) kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://powarman.dyndns.org/hgwebdir.cgi/v4l-dvb-saa716x/archive/196681f1e154.tar.gz -> v4l-dvb-saa716x-0.0.1_p20140322.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=de097f1de474079dd91580f604b381c0
diff --git a/metadata/md5-cache/media-video/bino-1.4.4 b/metadata/md5-cache/media-video/bino-1.4.4
new file mode 100644
index 000000000000..260493c7dbe2
--- /dev/null
+++ b/metadata/md5-cache/media-video/bino-1.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/glew-1.6.0 >=media-libs/openal-1.15.1 dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtopengl:4 >=media-libs/libass-0.9.9 >=virtual/ffmpeg-0.6.90 lirc? ( app-misc/lirc ) video_cards_nvidia? ( media-video/nvidia-settings ) virtual/libintl sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Stereoscopic and multi-display media player
+EAPI=5
+HOMEPAGE=http://bino3d.org/
+IUSE=doc lirc video_cards_nvidia linguas_en linguas_bg linguas_de linguas_fr linguas_ru linguas_zh_CN
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-libs/glew-1.6.0 >=media-libs/openal-1.15.1 dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtopengl:4 >=media-libs/libass-0.9.9 >=virtual/ffmpeg-0.6.90 lirc? ( app-misc/lirc ) video_cards_nvidia? ( media-video/nvidia-settings ) virtual/libintl
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/bino/bino-1.4.4.tar.xz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=f885d68e7c14c4ddf1b385e9a09b718f
diff --git a/metadata/md5-cache/media-video/cheese-3.10.2 b/metadata/md5-cache/media-video/cheese-3.10.2
index cbfa287c4b37..8150aa3f4972 100644
--- a/metadata/md5-cache/media-video/cheese-3.10.2
+++ b/metadata/md5-cache/media-video/cheese-3.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.4:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] >=virtual/udev-171:=[gudev] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.4:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] >=virtual/udev-171:=[gudev] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A cheesy program to take pictures and videos from your webcam
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/cheese/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.4:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] >=virtual/udev-171:=[gudev] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
 SLOT=0/7
 SRC_URI=mirror://gnome/sources/cheese/3.10/cheese-3.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=34037df34fb80ab4bd166f0a5dcd4aca
diff --git a/metadata/md5-cache/media-video/cheese-3.12.1 b/metadata/md5-cache/media-video/cheese-3.12.1
index 8bb1ebb5ddad..46502ce1d36e 100644
--- a/metadata/md5-cache/media-video/cheese-3.12.1
+++ b/metadata/md5-cache/media-video/cheese-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] >=virtual/udev-171:=[gudev] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) || ( dev-lang/vala:0.22 dev-lang/vala:0.24 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] >=virtual/udev-171:=[gudev] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) || ( dev-lang/vala:0.24 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A cheesy program to take pictures and videos from your webcam
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/cheese/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] >=virtual/udev-171:=[gudev] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
 SLOT=0/7
 SRC_URI=mirror://gnome/sources/cheese/3.12/cheese-3.12.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2d1fe0bee97380bf359956e3600b810e
diff --git a/metadata/md5-cache/media-video/gnome-video-effects-0.4.1 b/metadata/md5-cache/media-video/gnome-video-effects-0.4.1
index a2da737bf6d7..c9e3f5980893 100644
--- a/metadata/md5-cache/media-video/gnome-video-effects-0.4.1
+++ b/metadata/md5-cache/media-video/gnome-video-effects-0.4.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 app-arch/xz-utils >=s
 DESCRIPTION=Effects for Cheese, the webcam video and picture application
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeVideoEffects
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-video-effects/0.4/gnome-video-effects-0.4.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=48c17b18adf1c7a76e9906e5d6324615
+_md5_=58c05827f601e56ef959d61fffbe55d3
diff --git a/metadata/md5-cache/media-video/gtk-recordmydesktop-0.3.8-r3 b/metadata/md5-cache/media-video/gtk-recordmydesktop-0.3.8-r3
index 7ac3413541f7..d7ab1057ca42 100644
--- a/metadata/md5-cache/media-video/gtk-recordmydesktop-0.3.8-r3
+++ b/metadata/md5-cache/media-video/gtk-recordmydesktop-0.3.8-r3
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ interface for RecordMyDesktop
 EAPI=5
 HOMEPAGE=http://recordmydesktop.sourceforge.net/
 IUSE=python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.10.0:2 dev-python/pygtk:2 >=media-video/recordmydesktop-0.3.5 x11-apps/xwininfo python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/recordmydesktop/gtk-recordmydesktop-0.3.8.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=323fa812693291e5f86dcaedd2f60f90
+_md5_=18e1746139ddc0fd061d180fff32319c
diff --git a/metadata/md5-cache/media-video/movit-1.1.1 b/metadata/md5-cache/media-video/movit-1.1.1
new file mode 100644
index 000000000000..4a806003961e
--- /dev/null
+++ b/metadata/md5-cache/media-video/movit-1.1.1
@@ -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.1.tar.gz http://googletest.googlecode.com/files/gtest-1.7.0.zip
+_md5_=095020ccf572c1dfc998b8ac1add995b
diff --git a/metadata/md5-cache/media-video/mplayer2-2.0_p20131009 b/metadata/md5-cache/media-video/mplayer2-2.0_p20131009
new file mode 100644
index 000000000000..53505c7ec344
--- /dev/null
+++ b/metadata/md5-cache/media-video/mplayer2-2.0_p20131009
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/ncurses sys-libs/zlib X? ( x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) directfb? ( dev-libs/DirectFB ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg:0 ) ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mplayer ) >=virtual/ffmpeg-9[threads?,vdpau?] symlink? ( !media-video/mplayer ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-3.3.2-r2:3.3 >=dev-lang/python-3.2.5-r2:3.2 ) dev-python/docutils X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets )
+DESCRIPTION=Media Player for Linux
+EAPI=5
+HOMEPAGE=http://www.mplayer2.org/
+IUSE=+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd +dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio pvr +quvi radio samba selinux +shm tga +threads +unicode v4l vcd vdpau +X xinerama +xscreensaver +xv yuv4mpeg symlink 3dnow 3dnowext altivec +mmx mmxext sse sse2 ssse3
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses sys-libs/zlib X? ( x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) directfb? ( dev-libs/DirectFB ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg:0 ) ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mplayer ) >=virtual/ffmpeg-9[threads?,vdpau?] symlink? ( !media-video/mplayer )
+REQUIRED_USE=cddb? ( cdio network ) dvdnav? ( dvd ) enca? ( iconv ) lcms? ( opengl ) libass? ( iconv ) opengl? ( || ( aqua X ) ) portaudio? ( threads ) pvr? ( v4l ) radio? ( v4l || ( alsa oss ) ) v4l? ( threads ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~maksbotan/mplayer2-2.0_p20131009.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=9622dab9ff6d907f8c02c1f751e76c7c
diff --git a/metadata/md5-cache/media-video/subtitleeditor-0.41.0-r1 b/metadata/md5-cache/media-video/subtitleeditor-0.41.0-r1
index 720cf95d830c..cf7fd52ec38e 100644
--- a/metadata/md5-cache/media-video/subtitleeditor-0.41.0-r1
+++ b/metadata/md5-cache/media-video/subtitleeditor-0.41.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+2 subtitle editing tool
 EAPI=5
 HOMEPAGE=http://home.gna.org/subtitleeditor/
 IUSE=debug nls opengl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/iso-codes >=dev-cpp/gtkmm-2.14:2.4 >=dev-cpp/glibmm-2.16.3:2 >=dev-cpp/libxmlpp-2.20:2.6 >=app-text/enchant-1.4 >=dev-cpp/gstreamermm-0.10.6 >=media-libs/gst-plugins-good-0.10:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-pango-0.10:0.10 >=media-plugins/gst-plugins-xvideo-0.10:0.10 opengl? ( >=dev-cpp/gtkglextmm-1.2 )
 SLOT=0
 SRC_URI=http://download.gna.org/subtitleeditor/0.41/subtitleeditor-0.41.0.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3e3292a29b1532a62ca740bf3cfb4471
+_md5_=0a574998f238618d4563ee0983b496ba
diff --git a/metadata/md5-cache/media-video/transcode-1.1.7-r3 b/metadata/md5-cache/media-video/transcode-1.1.7-r3
index 90d35583c8f1..cd282c6ad69d 100644
--- a/metadata/md5-cache/media-video/transcode-1.1.7-r3
+++ b/metadata/md5-cache/media-video/transcode-1.1.7-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A suite of utilities for transcoding video and audio codecs in diffe
 EAPI=5
 HOMEPAGE=http://tcforge.berlios.de/
 IUSE=3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/ffmpeg-0.10 a52? ( media-libs/a52dec ) aac? ( media-libs/faac ) alsa? ( media-libs/alsa-lib ) dv? ( media-libs/libdv ) dvd? ( media-libs/libdvdread ) iconv? ( virtual/libiconv ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg ) lzo? ( >=dev-libs/lzo-2 ) mjpeg? ( media-video/mjpegtools ) mp3? ( media-sound/lame ) mpeg? ( media-libs/libmpeg2 ) ogg? ( media-libs/libogg ) postproc? ( >=virtual/ffmpeg-0.10 ) quicktime? ( >=media-libs/libquicktime-1 ) sdl? ( >=media-libs/libsdl-1.2.5[X?] ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2 ) v4l? ( media-libs/libv4l ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libXpm x11-libs/libXaw x11-libs/libXv ) x264? ( media-libs/x264 ) xml? ( dev-libs/libxml2 ) xvid? ( media-libs/xvid )
 REQUIRED_USE=sse? ( mmx ) sse2? ( mmx sse ) 3dnow? ( mmx ) nuv? ( lzo )
 SLOT=0
 SRC_URI=mirror://bitbucket/france/transcode-tcforge/downloads/transcode-1.1.7.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3fddd180a017598733c462164f664082
+_md5_=167771017c39b739bd6e0707a962e78d
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.7.26 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.7.26
new file mode 100644
index 000000000000..68a5ae6c2208
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.7.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Clients for net-analyzer/argus
+EAPI=5
+HOMEPAGE=http://www.qosient.com/argus/
+IUSE=debug ft geoip mysql sasl tcpd
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
+SLOT=0
+SRC_URI=http://qosient.com/argus/dev/argus-clients-3.0.7.26.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=a35499e85ef2e2f612ddc4c62c1e228f
diff --git a/metadata/md5-cache/net-analyzer/darkstat-3.0.718 b/metadata/md5-cache/net-analyzer/darkstat-3.0.718
new file mode 100644
index 000000000000..255545eea53a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/darkstat-3.0.718
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=Network traffic analyzer with cute web interface
+EAPI=5
+HOMEPAGE=http://unix4lyfe.org/darkstat/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=http://unix4lyfe.org/darkstat/darkstat-3.0.718.tar.bz2
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6f2a55463b33db8da26544a7ff9540df
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.8.13 b/metadata/md5-cache/net-analyzer/fail2ban-0.8.13
index ef7a624fd67a..49ff64095af0 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.8.13
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.8.13
@@ -4,11 +4,11 @@ DESCRIPTION=scans log files and bans IPs that show malicious signs
 EAPI=5
 HOMEPAGE=http://www.fail2ban.org/
 IUSE=selinux python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-misc/whois virtual/mta virtual/logger net-firewall/iptables selinux? ( sec-policy/selinux-fail2ban ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.8.13 -> fail2ban-0.8.13.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=ceb0094087724b337b68bed4f662398b
+_md5_=b7d4a0c992dc1605a5f4b5f90ecf2b58
diff --git a/metadata/md5-cache/net-analyzer/gr-fosphor-9999 b/metadata/md5-cache/net-analyzer/gr-fosphor-9999
index 12e6e2344686..f6f0dc9e6930 100644
--- a/metadata/md5-cache/net-analyzer/gr-fosphor-9999
+++ b/metadata/md5-cache/net-analyzer/gr-fosphor-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) >=net-wireless/gnuradio-3.7_rc:0=[qt4?,wxwidgets?] net-wireless/gr-osmosdr glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl dev-lang/swig:0 dev-util/cppunit sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) >=net-wireless/gnuradio-3.7_rc:0=[qt4?,wxwidgets?] glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl dev-lang/swig:0 dev-util/cppunit sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
 DESCRIPTION=gnuradio fosphor block (GPU spectrum display)
 EAPI=5
 HOMEPAGE=https://sdr.osmocom.org/trac/wiki/fosphor
 IUSE=+glfw qt4 wxwidgets python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 LICENSE=GPL-3+
-RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) >=net-wireless/gnuradio-3.7_rc:0=[qt4?,wxwidgets?] net-wireless/gr-osmosdr glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl
+RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) >=net-wireless/gnuradio-3.7_rc:0=[qt4?,wxwidgets?] glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl
 SLOT=0
 _eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e43e4ea5026f26fc748059d022f7eaea
+_md5_=bf4dd173208f6fa2de97ffdf839d2d8b
diff --git a/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1 b/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
index 5a9ffde9183a..c63679aec8ab 100644
--- a/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
+++ b/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A console-based network monitoring utility
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/iptraf-ng/
 IUSE=doc
-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=GPL-2 doc? ( FDL-1.1 )
 RDEPEND=>=sys-libs/ncurses-5.7-r7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.4.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=723a8cfd8791ea587e432212ab570a82
+_md5_=af64db5a2521ee952c16a27f017fea1c
diff --git a/metadata/md5-cache/net-analyzer/mate-netspeed-1.6.1 b/metadata/md5-cache/net-analyzer/mate-netspeed-1.6.1
index d0710087bf85..1d2c96e08105 100644
--- a/metadata/md5-cache/net-analyzer/mate-netspeed-1.6.1
+++ b/metadata/md5-cache/net-analyzer/mate-netspeed-1.6.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/libgtop-2.14.2:2 >=mate-base/mate-panel-1.6:
 DESCRIPTION=Applet showing network traffic for MATE
 EAPI=5
 HOMEPAGE=http://mate-desktop.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=gnome-base/libgtop-2.14.2:2 >=mate-base/mate-panel-1.6:0 >=net-wireless/wireless-tools-28_pre9:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango:0 virtual/libintl:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-netspeed-1.6.1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=933a82649c1220fa0c60dc63ebba1c6e
+_md5_=996a43c2d8557cd2e3a6b5f82ba70636
diff --git a/metadata/md5-cache/net-analyzer/nb-0.8.14 b/metadata/md5-cache/net-analyzer/nb-0.8.14
index 2fa5982c46b6..ba81b802f768 100644
--- a/metadata/md5-cache/net-analyzer/nb-0.8.14
+++ b/metadata/md5-cache/net-analyzer/nb-0.8.14
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-lang/perl virtual/pkgconfig sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Nodebrain is a tool to monitor and do event correlation.
+DESCRIPTION=Nodebrain is a tool to monitor and do event correlation
 EAPI=5
 HOMEPAGE=http://nodebrain.sourceforge.net/
 IUSE=static-libs
@@ -10,4 +10,4 @@ RDEPEND=!sys-boot/netboot !www-apps/nanoblogger
 SLOT=0
 SRC_URI=mirror://sourceforge/nodebrain/nodebrain-0.8.14.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=54dcf6d2fbee4b041d63212e452ff145
+_md5_=aa2fcdf8bcc5d087c23ed0c8d7f02f06
diff --git a/metadata/md5-cache/net-analyzer/nb-0.6.5-r1 b/metadata/md5-cache/net-analyzer/nb-0.8.16
similarity index 53%
rename from metadata/md5-cache/net-analyzer/nb-0.6.5-r1
rename to metadata/md5-cache/net-analyzer/nb-0.8.16
index dad01cf462c2..a796a9815186 100644
--- a/metadata/md5-cache/net-analyzer/nb-0.6.5-r1
+++ b/metadata/md5-cache/net-analyzer/nb-0.8.16
@@ -1,11 +1,13 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-lang/perl !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Nodebrain is a tool to monitor and do event correlation.
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-lang/perl virtual/pkgconfig sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Nodebrain is a tool to monitor and do event correlation
+EAPI=5
 HOMEPAGE=http://nodebrain.sourceforge.net/
-KEYWORDS=~ppc ~x86
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!sys-boot/netboot !www-apps/nanoblogger
 SLOT=0
-SRC_URI=mirror://sourceforge/nodebrain/nb-0.6.5-source.tar.gz
+SRC_URI=mirror://sourceforge/nodebrain/nodebrain-0.8.16.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=140c694e26ee11c1908ea7852730df48
+_md5_=ae51fbf07395d5132f375b18d4df1b62
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_pre3 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_pre3
index e6cbbdc82a6e..9200eb701ccc 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_pre3
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_pre3
@@ -4,7 +4,7 @@ DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=5
 HOMEPAGE=http://net-snmp.sourceforge.net/
 IUSE=bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-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=HPND BSD GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:1.1 ) mysql? ( virtual/mysql ) perl? ( X? ( dev-perl/perl-tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp ) dev-lang/perl:=[-build(-)]
 REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) ) rpm? ( bzip2 zlib )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/net-snmp/net-snmp/5.7.3-pre-releases/net-snmp-5.7.3.pre3.tar.gz http://dev.gentoo.org/~flameeyes/net-snmp/net-snmp-5.7.2-patches-1.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=e6250e6fafe3120ef25b58e6b74b220f
+_md5_=17d151006a3eef3b2648367987af6cfe
diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.0-r3 b/metadata/md5-cache/net-analyzer/nethogs-0.8.0-r3
index 1ba9f551efdd..ae863c0972a3 100644
--- a/metadata/md5-cache/net-analyzer/nethogs-0.8.0-r3
+++ b/metadata/md5-cache/net-analyzer/nethogs-0.8.0-r3
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap sys-libs/ncurses virtual/pkgconfig
 DESCRIPTION=A small 'net top' tool, grouping bandwidth by process
 EAPI=5
 HOMEPAGE=http://nethogs.sf.net/
-KEYWORDS=~amd64 ~ia64 ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~x86
 LICENSE=GPL-1
 RDEPEND=net-libs/libpcap sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/nethogs/nethogs-0.8.0.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=90360ae823e9ca356ca5b04336804f70
+_md5_=cfc839f6dd4faab2157d6df659bcc76c
diff --git a/metadata/md5-cache/net-analyzer/sec-2.6.2 b/metadata/md5-cache/net-analyzer/sec-2.6.2
deleted file mode 100644
index efddc05a93cf..000000000000
--- a/metadata/md5-cache/net-analyzer/sec-2.6.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Simple Event Correlator
-EAPI=4
-HOMEPAGE=http://simple-evcorr.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6.0
-SLOT=0
-SRC_URI=mirror://sourceforge/simple-evcorr/sec-2.6.2.tar.gz
-_md5_=2bc8973ab9772c01a9c89da6b61310db
diff --git a/metadata/md5-cache/net-analyzer/sec-2.7.5 b/metadata/md5-cache/net-analyzer/sec-2.7.5
new file mode 100644
index 000000000000..fead52d00321
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sec-2.7.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Simple Event Correlator
+EAPI=5
+HOMEPAGE=http://simple-evcorr.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.8.0
+SLOT=0
+SRC_URI=mirror://sourceforge/simple-evcorr/sec-2.7.5.tar.gz
+_md5_=dda863191f4ad7df9c600e84721f0ea3
diff --git a/metadata/md5-cache/net-analyzer/sflowtool-3.31 b/metadata/md5-cache/net-analyzer/sflowtool-3.31
new file mode 100644
index 000000000000..ccd8b167b5e6
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sflowtool-3.31
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=sflowtool is a utility for collecting and processing sFlow data
+EAPI=5
+HOMEPAGE=http://www.inmon.com/technology/sflowTools.php
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=inmon-sflow
+SLOT=0
+SRC_URI=http://www.inmon.com/bin/sflowtool-3.31.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=51470f3f636145dcbb27b125b39af354
diff --git a/metadata/md5-cache/net-analyzer/tsung-1.5.1 b/metadata/md5-cache/net-analyzer/tsung-1.5.1
new file mode 100644
index 000000000000..fc3937a3ee83
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tsung-1.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-lang/erlang
+DESCRIPTION=Erlang's multi-protocol distributed load testing tool
+EAPI=3
+HOMEPAGE=http://tsung.erlang-projects.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/erlang
+RESTRICT=test
+SLOT=0
+SRC_URI=http://tsung.erlang-projects.org/dist/tsung-1.5.1.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=2fca88f81b8f74ef45f7e1c075044c82
diff --git a/metadata/md5-cache/net-analyzer/yersinia-0.7.3 b/metadata/md5-cache/net-analyzer/yersinia-0.7.3
index fa981d1fb252..8aab6ed45345 100644
--- a/metadata/md5-cache/net-analyzer/yersinia-0.7.3
+++ b/metadata/md5-cache/net-analyzer/yersinia-0.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=A layer 2 attack framework
 EAPI=5
 HOMEPAGE=http://www.yersinia.net/
 IUSE=gtk ncurses
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.5 ) gtk? ( =x11-libs/gtk+-2* ) >=net-libs/libnet-1.1.2 >=net-libs/libpcap-0.9.4
 SLOT=0
 SRC_URI=http://www.yersinia.net/download/yersinia-0.7.3.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=dace1d33146bd2c37d86dd85f18c020e
+_md5_=cc3620f790b75958fb301819fdd12b1e
diff --git a/metadata/md5-cache/net-dialup/freeradius-2.2.5 b/metadata/md5-cache/net-dialup/freeradius-2.2.5
new file mode 100644
index 000000000000..3dce0c4fb2d9
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure install preinst prepare setup
+DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl sys-libs/gdbm python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=5
+HOMEPAGE=http://www.freeradius.org/
+IUSE=bindist debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap postgres python readline sqlite ssl
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl sys-libs/gdbm python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic )
+REQUIRED_USE=bindist? ( !firebird )
+SLOT=0
+SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.2.5.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-2.2.5.tar.gz http://dev.gentoo.org/~flameeyes/freeradius/freeradius-2.2.0-patches-4.tar.xz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4429c2152a935f4374f354d8f20381b0
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.2 b/metadata/md5-cache/net-dialup/freeradius-3.0.2
new file mode 100644
index 000000000000..4c5e607d46a7
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl sys-libs/gdbm python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=5
+HOMEPAGE=http://www.freeradius.org/
+IUSE=bindist debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap postgres python readline sqlite ssl
+LICENSE=GPL-2
+RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl sys-libs/gdbm python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic )
+REQUIRED_USE=bindist? ( !firebird )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.2.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.2.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5f48db5e4e4cbaac1b4c5391566364a4
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.1-r4 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.1-r4
index 703d17309452..f9a356f4fe4b 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.1-r4
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
 EAPI=5
 HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/
 IUSE=dnsretry +kernel
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-dialup/ppp
 SLOT=0
 SRC_URI=https://github.com/xelerance/xl2tpd/tarball/v1.3.1 -> xl2tpd-1.3.1.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=8456980dbce0b665a3d6345436dac554
+_md5_=5fa7d776af378433e7d711223b43693e
diff --git a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1 b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
index d825d2e679e6..cf11513ceff3 100644
--- a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
+++ b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Proxy DNS server with permanent caching
 EAPI=5
 HOMEPAGE=http://members.home.nl/p.a.rombouts/pdnsd/
 IUSE=debug ipv6 isdn +urandom test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ia64 ppc ~s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=sys-apps/openrc
 SLOT=0
 SRC_URI=http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e89fd1e71e7cd851c84162d7b88291d7
+_md5_=306af4257501ed5bc475200a564ee1ea
diff --git a/metadata/md5-cache/net-im/birdie-1.1 b/metadata/md5-cache/net-im/birdie-1.1
index 982523a3e6c6..2b5cd687588c 100644
--- a/metadata/md5-cache/net-im/birdie-1.1
+++ b/metadata/md5-cache/net-im/birdie-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite:3 >=dev-libs/granite-0.2.1 dev-libs/json-glib dev-libs/libdbusmenu:3 dev-libs/libgee:0 net-libs/libsoup:2.4 net-libs/rest:0.7 media-libs/libcanberra net-im/pidgin net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.10:3 x11-libs/gtksourceview:3.0 x11-libs/libnotify x11-libs/libXtst || ( dev-lang/vala:0.22 ) dev-util/ninja >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 >=dev-libs/granite-0.2.1 dev-libs/json-glib dev-libs/libdbusmenu:3 dev-libs/libgee:0 net-libs/libsoup:2.4 net-libs/rest:0.7 media-libs/libcanberra net-im/pidgin net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.10:3 x11-libs/gtksourceview:3.0 x11-libs/libnotify x11-libs/libXtst || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) dev-util/ninja >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Twitter client for Linux
 EAPI=5
 HOMEPAGE=http://birdieapp.github.io/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/granite-0.2.1 dev-libs/json-glib dev-libs/libdbusmenu:3 dev-libs/libgee:0 net-libs/libsoup:2.4 net-libs/rest:0.7 media-libs/libcanberra net-im/pidgin net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.10:3 x11-libs/gtksourceview:3.0 x11-libs/libnotify x11-libs/libXtst
 SLOT=0
 SRC_URI=https://github.com/birdieapp/birdie/archive/1.1.tar.gz -> birdie-1.1.tar.gz
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=06d4a20c9a1e0592a8e566b7d42fde9f
diff --git a/metadata/md5-cache/net-im/openfire-3.9.2-r1 b/metadata/md5-cache/net-im/openfire-3.9.2-r1
index e5c33071d68c..615d1534e772 100644
--- a/metadata/md5-cache/net-im/openfire-3.9.2-r1
+++ b/metadata/md5-cache/net-im/openfire-3.9.2-r1
@@ -3,10 +3,10 @@ DEPEND=net-im/jabber-base ~dev-java/ant-contrib-1.0_beta2 >=virtual/jdk-1.5 >=de
 DESCRIPTION=Openfire (formerly wildfire) real time collaboration (RTC) server
 HOMEPAGE=http://www.igniterealtime.org/projects/openfire/
 IUSE=doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_9_2.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=baea96544463aadc178b88295ff7bd36
+_md5_=4a0f4645605601bbe1257ed0dacd597c
diff --git a/metadata/md5-cache/net-irc/loqui-0.5.4 b/metadata/md5-cache/net-irc/loqui-0.5.4
index 720a5527bcb0..27747f252b78 100644
--- a/metadata/md5-cache/net-irc/loqui-0.5.4
+++ b/metadata/md5-cache/net-irc/loqui-0.5.4
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.4:2 >=net-libs/gnet-2.0.3 virtua
 DESCRIPTION=a graphical IRC client for GNOME2 on UNIX like operating system.
 EAPI=4
 HOMEPAGE=https://launchpad.net/loqui/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.4:2 >=net-libs/gnet-2.0.3
 SLOT=0
 SRC_URI=https://launchpad.net/loqui/0.5/0.5.4/+download/loqui-0.5.4.tar.gz
-_md5_=b6a6ea129b2f470d7e4689e029a68375
+_md5_=5795a703943bafcadf8fdafc440f37dc
diff --git a/metadata/md5-cache/net-irc/quassel-0.10.0 b/metadata/md5-cache/net-irc/quassel-0.10.0
deleted file mode 100644
index e74cf288f4d8..000000000000
--- a/metadata/md5-cache/net-irc/quassel-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=dev-qt/qtcore:4[ssl?] monolithic? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) !monolithic? ( server? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) ) kde? ( dev-util/automoc ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
-EAPI=5
-HOMEPAGE=http://quassel-irc.org/
-IUSE=ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4[ssl?] monolithic? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) !monolithic? ( server? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) )
-REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) syslog? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) ) phonon? ( || ( X monolithic ) ) dbus? ( || ( X monolithic ) ) ayatana? ( || ( X monolithic ) ) webkit? ( || ( X monolithic ) )
-SLOT=0
-SRC_URI=http://quassel-irc.org/pub/quassel-0.10.0.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=47b5922e4848f779a3ff756ba306da81
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index 7300e0f18eff..5061f55af739 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:4[ssl?] monolithic? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) !monolithic? ( server? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) ) kde? ( dev-util/automoc ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-qt/qtcore:4[ssl?] monolithic? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) !monolithic? ( server? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) ) kde? ( dev-util/automoc ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
 EAPI=5
 HOMEPAGE=http://quassel-irc.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4[ssl?] monolithic? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) !monolithic? ( server? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( dev-qt/qtdbus:4 dev-libs/libdbusmenu-qt ) kde? ( kde-base/kdelibs:4 kde-base/oxygen-icons:4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) syslog? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) ) phonon? ( || ( X monolithic ) ) dbus? ( || ( X monolithic ) ) ayatana? ( || ( X monolithic ) ) webkit? ( || ( X monolithic ) )
 SLOT=0
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-r3	e83b3dde426430f34178059a8de5299d	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=291faef40e1313d19517f925763c0e5f
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-r3	e83b3dde426430f34178059a8de5299d	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=6083400707ea1ddb70ba7e944f824334
diff --git a/metadata/md5-cache/net-irc/sic-1.2 b/metadata/md5-cache/net-irc/sic-1.2
index e45f9d107c7e..9f2c7ecfbe6b 100644
--- a/metadata/md5-cache/net-irc/sic-1.2
+++ b/metadata/md5-cache/net-irc/sic-1.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=An extremly simple IRC client
 EAPI=4
 HOMEPAGE=http://tools.suckless.org/sic
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://dl.suckless.org/tools/sic-1.2.tar.gz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a373961a53be1754e209083f547819a3
+_md5_=428a632c0f0c6b45996dd26a5ae1d89c
diff --git a/metadata/md5-cache/net-irc/telepathy-idle-0.2.0 b/metadata/md5-cache/net-irc/telepathy-idle-0.2.0
index a15819637d3b..9717a46b90be 100644
--- a/metadata/md5-cache/net-irc/telepathy-idle-0.2.0
+++ b/metadata/md5-cache/net-irc/telepathy-idle-0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Full-featured IRC connection manager for Telepathy
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/telepathy/telepathy-idle
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.32:2 >=net-libs/telepathy-glib-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-apps/dbus python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.2.0.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=fd40fd8a3bebdc2f14891a149fb2e180
+_md5_=c86697f16d7b8ab786a8c1d1c1f11074
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.10.4 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.10.4
index dd2a84a05346..916533b41c92 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.10.4
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.10.4
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME framework for accessing online accounts
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
 IUSE=gnome +introspection kerberos debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+
 PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
 RDEPEND=>=dev-libs/glib-2.35:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.1.90:3 >=x11-libs/gtk+-3.5.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) kerberos? ( app-crypt/gcr:0= app-crypt/mit-krb5 )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.10/gnome-online-accounts-3.10.4.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ed356d62ae492981607d8a0fed806465
+_md5_=fcb3bbfff0bd33aefde6928f031b98a2
diff --git a/metadata/md5-cache/net-libs/gssdp-0.14.7 b/metadata/md5-cache/net-libs/gssdp-0.14.7
index 925b79eb47d8..38168950b1c3 100644
--- a/metadata/md5-cache/net-libs/gssdp-0.14.7
+++ b/metadata/md5-cache/net-libs/gssdp-0.14.7
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=net-libs/libsoup-2.26.1:2.4[introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 >=net-libs/libsoup-2.26.1:2.4[introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A GObject-based API for handling resource discovery and announcement over SSDP
 EAPI=5
 HOMEPAGE=http://gupnp.org/
 IUSE=+introspection +gtk
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 >=net-libs/libsoup-2.26.1:2.4[introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-libs/libsoup-2.26.1:2.4[introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/gssdp/0.14/gssdp-0.14.7.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4d6d6bcd9877a8c55e285b3ec05725ae
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.5.2 b/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
index b4d56194b848..330c37ab23b4 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=VNC viewer widget for GTK
 EAPI=5
 HOMEPAGE=https://live.gnome.org/gtk-vnc
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-er
 REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) vala? ( gtk3 introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1edd8c61bba68671348c1c984016f0cc
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.5.3 b/metadata/md5-cache/net-libs/gtk-vnc-0.5.3
index 86e9ac0abfbc..ab30a03f9795 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.5.3
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=VNC viewer widget for GTK
 EAPI=5
 HOMEPAGE=https://live.gnome.org/gtk-vnc
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-er
 REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) vala? ( gtk3 introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.3.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b8d6dbe1c3a921f7469976810b52437e
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.10 b/metadata/md5-cache/net-libs/gupnp-0.20.10
index b4843524518d..5ff3de60e9c8 100644
--- a/metadata/md5-cache/net-libs/gupnp-0.20.10
+++ b/metadata/md5-cache/net-libs/gupnp-0.20.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
 EAPI=5
 HOMEPAGE=http://gupnp.org/
 IUSE=connman +introspection kernel_linux networkmanager python_targets_python2_6 python_targets_python2_7
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2
-RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.10.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=89cb8ed8403ead6bbfecc7d7e9072f88
diff --git a/metadata/md5-cache/net-libs/gupnp-av-0.12.5 b/metadata/md5-cache/net-libs/gupnp-av-0.12.5
index ff2aca6d32d0..3bf92b473a6d 100644
--- a/metadata/md5-cache/net-libs/gupnp-av-0.12.5
+++ b/metadata/md5-cache/net-libs/gupnp-av-0.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Utility library aiming to ease the handling UPnP A/V profiles
 EAPI=5
 HOMEPAGE=http://gupnp.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.5.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=39cc63d0167171c690d6fc2c1403659c
diff --git a/metadata/md5-cache/net-libs/gupnp-vala-0.10.5 b/metadata/md5-cache/net-libs/gupnp-vala-0.10.5
index 6ab5d3332573..28b33423bcb1 100644
--- a/metadata/md5-cache/net-libs/gupnp-vala-0.10.5
+++ b/metadata/md5-cache/net-libs/gupnp-vala-0.10.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=prepare
-DEPEND=|| ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) >=net-libs/gupnp-0.18 >=net-libs/gssdp-0.12.2[introspection] >=net-libs/gupnp-av-0.9 >=media-libs/gupnp-dlna-0.5.1:1.0 virtual/pkgconfig app-arch/xz-utils
+DEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) >=net-libs/gupnp-0.18 >=net-libs/gssdp-0.12.2[introspection] >=net-libs/gupnp-av-0.9 >=media-libs/gupnp-dlna-0.5.1:1.0 virtual/pkgconfig app-arch/xz-utils
 DESCRIPTION=Vala bindings for the GUPnP framework.
 EAPI=4
 HOMEPAGE=http://gupnp.org/
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
-RDEPEND=|| ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) >=net-libs/gupnp-0.18 >=net-libs/gssdp-0.12.2[introspection] >=net-libs/gupnp-av-0.9 >=media-libs/gupnp-dlna-0.5.1:1.0
+RDEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) >=net-libs/gupnp-0.18 >=net-libs/gssdp-0.12.2[introspection] >=net-libs/gupnp-av-0.9 >=media-libs/gupnp-dlna-0.5.1:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-vala/0.10/gupnp-vala-0.10.5.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4cb7d386aa61db9909a8e1c5fbc158d9
diff --git a/metadata/md5-cache/net-libs/libmbim-1.6.0 b/metadata/md5-cache/net-libs/libmbim-1.6.0
index c6623f21a964..4bb1e740b2ec 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.6.0
+++ b/metadata/md5-cache/net-libs/libmbim-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=MBIM modem protocol helper library
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/libmbim/
 IUSE=doc static-libs test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/libmbim/libmbim-1.6.0.tar.xz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=32ff4ab6fe6727b6246bbd90818a4f5a
+_md5_=7e7cba50b2fceecacbf3ec6ac5ce5326
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.34 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.34
index 12acf8783de1..4d0d2bc9fa37 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.34
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.34
@@ -4,9 +4,9 @@ DESCRIPTION=A small C library that makes it easy to run an HTTP server as part o
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libmicrohttpd/
 IUSE=epoll messages ssl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0 net-libs/gnutls )
 SLOT=0
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.34.tar.gz
-_md5_=63a519229f5598d5fe0e61bc1afd9e2e
+_md5_=55822a5eef52f6f91536b7ee39e04eb8
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.35 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.35
new file mode 100644
index 000000000000..a78aa1223ce3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.35
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=ssl? ( dev-libs/libgcrypt:0 net-libs/gnutls ) test? ( ssl? ( >=net-misc/curl-7.25.0-r1[ssl] ) )
+DESCRIPTION=A small C library that makes it easy to run an HTTP server as part of another application.
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/libmicrohttpd/
+IUSE=epoll messages ssl static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=ssl? ( dev-libs/libgcrypt:0 net-libs/gnutls )
+SLOT=0
+SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.35.tar.gz
+_md5_=a999faa08f065ab7252c966ab209a702
diff --git a/metadata/md5-cache/net-libs/libsocialweb-0.25.21-r1 b/metadata/md5-cache/net-libs/libsocialweb-0.25.21-r1
index fcaebf328f24..fe777645858b 100644
--- a/metadata/md5-cache/net-libs/libsocialweb-0.25.21-r1
+++ b/metadata/md5-cache/net-libs/libsocialweb-0.25.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-base/libgnome-keyring dev-libs/dbus-glib dev-libs/json-glib net-libs/libsoup:2.4 gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) networkmanager? ( net-misc/networkmanager ) !networkmanager? ( connman? ( net-misc/connman ) ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-base/libgnome-keyring dev-libs/dbus-glib dev-libs/json-glib net-libs/libsoup:2.4 gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) networkmanager? ( net-misc/networkmanager ) !networkmanager? ( connman? ( net-misc/connman ) ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Social web services integration framework
 EAPI=5
 HOMEPAGE=http://git.gnome.org/browse/libsocialweb
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-b
 REQUIRED_USE=?? ( connman networkmanager ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsocialweb/0.25/libsocialweb-0.25.21.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=47db424ebe0785c98075b11e3a4a8bab
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0
new file mode 100644
index 000000000000..755ffd0afc6f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=RabbitMQ C client
+EAPI=5
+HOMEPAGE=https://github.com/alanxz/rabbitmq-c
+IUSE=tools
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.5.0.zip -> rabbitmq-c-v0.5.0.zip
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=488168e2c7887165046fb7f7f9892f27
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1 b/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1
index ce35d1519e97..e5b26b431023 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib bindings for the Telepathy D-Bus protocol.
 EAPI=5
 HOMEPAGE=http://telepathy.freedesktop.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=de
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.20.1.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4247e0f11953cad2d4785c055f48e1da
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.22.1 b/metadata/md5-cache/net-libs/telepathy-glib-0.22.1
index c926c40b2c05..5f92fc4da96a 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.22.1
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.22.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib bindings for the Telepathy D-Bus protocol.
 EAPI=5
 HOMEPAGE=http://telepathy.freedesktop.org
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) vala? ( in
 RESTRICT=test
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.22.1.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=7fdd59b67713615037216a5029f04e41
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.24.0 b/metadata/md5-cache/net-libs/telepathy-glib-0.24.0
index 135ad8e72352..0e50007ba1f1 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.24.0
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.24.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-arch/xz-utils >=sys-apps/sed-4 userland_GNU? ( >=sys-apps/coreutils-8.5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib bindings for the Telepathy D-Bus protocol.
 EAPI=5
 HOMEPAGE=http://telepathy.freedesktop.org
 IUSE=debug +introspection +vala debug python_targets_python2_6 python_targets_python2_7 test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=net-im/telepathy-mission-control
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 )
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) vala? ( in
 RESTRICT=test
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.0.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=919c431ad1fad4118d306beeb4108d8b
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=ab7485c7294d990f098759950f1f395a
diff --git a/metadata/md5-cache/net-misc/geoipupdate-2.0.1 b/metadata/md5-cache/net-misc/geoipupdate-2.0.1
new file mode 100644
index 000000000000..881889ee5268
--- /dev/null
+++ b/metadata/md5-cache/net-misc/geoipupdate-2.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=net-misc/curl sys-libs/zlib
+DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
+EAPI=5
+HOMEPAGE=https://github.com/maxmind/geoipupdate
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=net-misc/curl sys-libs/zlib !<dev-libs/geoip-1.6.0
+SLOT=0
+SRC_URI=https://github.com/maxmind/geoipupdate/releases/download/v2.0.1/geoipupdate-2.0.1.tar.gz
+_md5_=a2ade3c62bb7bcd3915ca0e79680af2e
diff --git a/metadata/md5-cache/net-misc/guacamole-server-0.9.0 b/metadata/md5-cache/net-misc/guacamole-server-0.9.0
new file mode 100644
index 000000000000..3c3d4a9e3985
--- /dev/null
+++ b/metadata/md5-cache/net-misc/guacamole-server-0.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/cairo ssh? ( x11-libs/pango net-libs/libssh2 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) vorbis? ( media-libs/libvorbis )
+DESCRIPTION=This is the proxy-daemon used by www-apps/guacamole.
+EAPI=5
+HOMEPAGE=http://guacamole.sourceforge.net/
+IUSE=rdesktop vnc ssh pulseaudio vorbis
+KEYWORDS=~x86
+LICENSE=AGPL-3
+RDEPEND=x11-libs/cairo ssh? ( x11-libs/pango net-libs/libssh2 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) vorbis? ( media-libs/libvorbis )
+SLOT=0
+SRC_URI=mirror://sourceforge/guacamole/guacamole-server-0.9.0.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=254195a9f1012aab767db5f2a18f2591
diff --git a/metadata/md5-cache/net-misc/livestreamer-1.8.0 b/metadata/md5-cache/net-misc/livestreamer-1.8.0
new file mode 100644
index 000000000000..8232e508f0f0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/livestreamer-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pycrypto >=dev-python/requests-1.0 >media-video/rtmpdump-2.4 dev-python/setuptools userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+DESCRIPTION=CLI tool that pipes video streams from services like twitch.tv into a video player
+EAPI=5
+HOMEPAGE=https://github.com/chrippa/livestreamer
+IUSE=python_targets_python2_7 python_targets_python3_2
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=Apache-2.0 BSD-2 MIT-with-advertising
+RDEPEND=dev-python/pycrypto >=dev-python/requests-1.0 >media-video/rtmpdump-2.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 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 )
+SLOT=0
+SRC_URI=https://github.com/chrippa/livestreamer/archive/v1.8.0.tar.gz -> livestreamer-1.8.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=74635589632f7ee54c92ac7a1cccf76b
diff --git a/metadata/md5-cache/net-misc/mediatomb-0.12.1-r8 b/metadata/md5-cache/net-misc/mediatomb-0.12.1-r8
new file mode 100644
index 000000000000..95902114a775
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mediatomb-0.12.1-r8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=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 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=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
+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	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=9fa61e89ae321a6e1c4b0b9dec2a3116
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.2.0 b/metadata/md5-cache/net-misc/modemmanager-1.2.0
index aff499bb36c3..da32b599675c 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.2.0
+++ b/metadata/md5-cache/net-misc/modemmanager-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=virtual/udev-147[gudev] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.32:2 >=virtual/udev-147[gudev] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 >=virtual/udev-147[gudev] introspection? ( >=dev-
 REQUIRED_USE=qmi-newest? ( qmi ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/ModemManager/ModemManager-1.2.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ffc009f08a77eac0dce7a8fd39a640e2
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1 b/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1
index 8efeccb03b99..2a8367668d24 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1
+++ b/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=virtual/udev-147[gudev] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.32:2 >=virtual/udev-147[gudev] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
 IUSE=+introspection mbim policykit +qmi qmi-newest vala
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=virtual/udev-147[gudev] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= )
 REQUIRED_USE=qmi-newest? ( qmi ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/ModemManager/ModemManager-1.2.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f1f121636f82f6b439b5771d9ba7fef6
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=fc2592c94ade8108b8946f79d9201f2d
diff --git a/metadata/md5-cache/net-misc/netpipes-4.2-r2 b/metadata/md5-cache/net-misc/netpipes-4.2-r2
index 5325c87acae2..46ff598ac816 100644
--- a/metadata/md5-cache/net-misc/netpipes-4.2-r2
+++ b/metadata/md5-cache/net-misc/netpipes-4.2-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=netpipes - a package to manipulate BSD TCP/IP stream sockets
 EAPI=5
 HOMEPAGE=http://web.purplefrog.com/~thoth/netpipes/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://web.purplefrog.com/~thoth/netpipes/ftp/netpipes-4.2-export.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=25f3b6cb47e53b4f5f89198185ff9f31
+_md5_=2ceea9994279aec9aa8376dd8755aebd
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.6.4 b/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
index 9fc679fff1a3..2c2a849d3cd9 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1= >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3= ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !wimax? ( !=dev-libs/libnl-3.2.20 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1= >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3= ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !wimax? ( !=dev-libs/libnl-3.2.20 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.6.4.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d76a9a827596c3fa68323b42998bfd2b
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.8.10 b/metadata/md5-cache/net-misc/networkmanager-0.9.8.10
index c912f6ce8382..5354d2294129 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.8.10
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.8.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) || ( sys-power/upower >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) || ( sys-power/upower >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/NetworkManager/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.8.10.tar.xz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=79bea7bcf1dbaf3ae7df81f98b4037a3
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.8.8 b/metadata/md5-cache/net-misc/networkmanager-0.9.8.8
index b693f08c9744..11671f097f8d 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.8.8
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.8.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) || ( sys-power/upower >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) || ( sys-power/upower >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/NetworkManager/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.8.8.tar.xz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=c6269ff696224bf12f584ba4b4ef4836
diff --git a/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.6 b/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.6
index d54ffb3dfcec..2d0260cd5276 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.6
+++ b/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.6
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager OpenConnect plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 gnome-base/libgnome-keyring >=net-misc/openconnect-3.02:= gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-0.9.8.6.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=74beac6f47c30e507eda2c7f7d784821
+_md5_=1a145d81cda3b437e92a2320b0ba2383
diff --git a/metadata/md5-cache/net-misc/openntpd-20080406-r8 b/metadata/md5-cache/net-misc/openntpd-20080406-r8
index f7e42b1de537..4917c4309669 100644
--- a/metadata/md5-cache/net-misc/openntpd-20080406-r8
+++ b/metadata/md5-cache/net-misc/openntpd-20080406-r8
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=5
 HOMEPAGE=http://www.openntpd.org/
 IUSE=ssl selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/openntpd/openntpd_20080406p.orig.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_20080406p-6.debian.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e787c35d7f1b81a6085eb286632b058d
+_md5_=4841d7525e1dc803c3e40305cc6b6b50
diff --git a/metadata/md5-cache/net-misc/rygel-0.22.1 b/metadata/md5-cache/net-misc/rygel-0.22.1
index 08565914cab4..c256ccea3704 100644
--- a/metadata/md5-cache/net-misc/rygel-0.22.1
+++ b/metadata/md5-cache/net-misc/rygel-0.22.1
@@ -4,10 +4,10 @@ DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
 IUSE=X nls +sqlite tracker test transcode test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.19 >=net-libs/gupnp-av-0.12.4 >=net-libs/libsoup-2.42:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring ) tracker? ( >=app-misc/tracker-0.16:= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rygel/0.22/rygel-0.22.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=233facc1107443c3f133a6542e224e6d
+_md5_=40cd5561f79cf3efa7c26af1768e3059
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.20-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.20-r1
index 5c794d8e17c4..b4137e4117a4 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.20-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.20-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/udev[gudev] policykit? ( sys-apps/acl >=sys-auth/polkit-0.101 ) ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) )
+DEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/udev[gudev] policykit? ( sys-apps/acl >=sys-auth/polkit-0.101 ) ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) )
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI.
 EAPI=5
 HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) pytho
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) ?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.20.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=818d162db6fe271c95d2418e420861f8
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.21 b/metadata/md5-cache/net-misc/spice-gtk-0.21
index 08e84016ea53..1438f8242362 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.21
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/udev[gudev] policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) )
+DEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/udev[gudev] policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) )
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI.
 EAPI=5
 HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) pytho
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) ?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.21.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=7628072084dc8fc925cfcc1fea44d699
diff --git a/metadata/md5-cache/net-misc/vinagre-3.10.2 b/metadata/md5-cache/net-misc/vinagre-3.10.2
index 649f5b1d2803..3a96669b4b45 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.10.2
+++ b/metadata/md5-cache/net-misc/vinagre-3.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) >=dev-lang/perl-5 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) >=dev-lang/perl-5 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=VNC client for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Vinagre
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.10/vinagre-3.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0cfbf9a4acada67f8130d79b24ecb932
diff --git a/metadata/md5-cache/net-misc/vinagre-3.12.1 b/metadata/md5-cache/net-misc/vinagre-3.12.1
index 42b086aa6052..7951ccc27056 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.12.1
+++ b/metadata/md5-cache/net-misc/vinagre-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) >=dev-lang/perl-5 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) >=dev-lang/perl-5 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=VNC client for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Vinagre
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.12/vinagre-3.12.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dbbabadcd0be4c5f6236070743b90faa
diff --git a/metadata/md5-cache/net-misc/whois-5.1.2 b/metadata/md5-cache/net-misc/whois-5.1.2
new file mode 100644
index 000000000000..647604efd4ef
--- /dev/null
+++ b/metadata/md5-cache/net-misc/whois-5.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 nls? ( sys-devel/gettext )
+DESCRIPTION=improved Whois Client
+EAPI=4
+HOMEPAGE=http://www.linux.it/~md/software/
+IUSE=iconv idn nls
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/w/whois/whois_5.1.2.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=69a620badfa558fd910af7f89790baff
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.0.1 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.0.1
index f36b7207de2f..80e88d8b3645 100644
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.0.1
+++ b/metadata/md5-cache/net-p2p/gtk-gnutella-1.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK+ Gnutella client
 EAPI=5
 HOMEPAGE=http://gtk-gnutella.sourceforge.net/
 IUSE=nls dbus ssl +gtk
-KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.0.1.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=59efa7183671728022065b3bc75907b9
+_md5_=41a3773080bdca89eba1135ef2b0c4de
diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.53 b/metadata/md5-cache/net-print/cups-filters-1.0.53
index a31f28832b6c..59a4147a78f4 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.0.53
+++ b/metadata/md5-cache/net-print/cups-filters-1.0.53
@@ -4,10 +4,10 @@ DESCRIPTION=Cups PDF filters
 EAPI=5
 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat
 IUSE=dbus +foomatic jpeg perl png static-libs tiff zeroconf
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-9.09 app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2:= media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.53.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=994f39e802c310bbf49640551146b420
+_md5_=04ea4a596c7faef405dd2f623b8fd3d6
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20140105 b/metadata/md5-cache/net-print/foomatic-db-4.0.20140105
index e240b088654a..4640a660d5d0 100644
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20140105
+++ b/metadata/md5-cache/net-print/foomatic-db-4.0.20140105
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/foomatic-db-4.0-20140105.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=652ffe4ee8d47be593a4d4a2048e47f9
+_md5_=a1c935e64a58e6c942098ae03be0e350
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105
index 3cce43a683d9..4b562a218439 100644
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=linuxprinting.org PPD files for postscript printers
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/foomatic-db-4.0-20140105.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=8038ff7e83c2dc18f98ed99d163c0b84
+_md5_=73720fb58e0e962afd38be5c10fca118
diff --git a/metadata/md5-cache/net-voip/telepathy-gabble-0.18.2 b/metadata/md5-cache/net-voip/telepathy-gabble-0.18.2
index d766689913b1..54bebad745ff 100644
--- a/metadata/md5-cache/net-voip/telepathy-gabble-0.18.2
+++ b/metadata/md5-cache/net-voip/telepathy-gabble-0.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=A Jabber/XMPP connection manager, with handling of single and multi
 EAPI=5
 HOMEPAGE=http://telepathy.freedesktop.org
 IUSE=gnutls +jingle plugins test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.19.9 dev-db/sqlite:3 dev-libs/libxml2 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] ) jingle? ( || ( net-libs/libsoup:2.4[ssl] >=net-libs/libsoup-2.33.1 ) >=net-libs/libnice-0.0.11 ) plugins? ( x11-libs/gtksourceview:3.0[introspection] ) !<net-im/telepathy-mission-control-5.5.0
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.18.2.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f2cc8e7b9f0ade1f5bfcf9e0bd3302ed
+_md5_=387a7077b1c0c97d0b8065d09677a513
diff --git a/metadata/md5-cache/net-wireless/bluez-5.18 b/metadata/md5-cache/net-wireless/bluez-5.18
index 7f8cefee1243..44905ed9809a 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.18
+++ b/metadata/md5-cache/net-wireless/bluez-5.18
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=5
 HOMEPAGE=http://www.bluez.org
 IUSE=cups debug +obex +readline selinux systemd test +udev
-KEYWORDS=~amd64 arm hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm hppa ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2 cups? ( net-print/cups:= ) obex? ( dev-libs/libical ) readline? ( sys-libs/readline:= ) selinux? ( sec-policy/selinux-bluetooth ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-171 )
 REQUIRED_USE=test? ( )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.18.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3f6b1cdcdd9178c49d4602e633bb898a
+_md5_=9fa0b1cc3ec93a791c90e9e7fee9f44b
diff --git a/metadata/md5-cache/net-wireless/mdk-3.6 b/metadata/md5-cache/net-wireless/mdk-3.6-r1
similarity index 79%
rename from metadata/md5-cache/net-wireless/mdk-3.6
rename to metadata/md5-cache/net-wireless/mdk-3.6-r1
index e21caff5012f..78fabdf451b3 100644
--- a/metadata/md5-cache/net-wireless/mdk-3.6
+++ b/metadata/md5-cache/net-wireless/mdk-3.6-r1
@@ -1,11 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Wireless injection tool with various functions.
-EAPI=3
+EAPI=5
 HOMEPAGE=http://homepages.tu-darmstadt.de/~p_larbig/wlan
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=net-wireless/aircrack-ng
 SLOT=0
 SRC_URI=http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk3-v6.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c241033e95ffb8d78dc21a7e7d246ccb
+_md5_=ab0e1c3e2d53f0f762b6b21019a8cdfe
diff --git a/metadata/md5-cache/sci-calculators/galculator-2.1.3 b/metadata/md5-cache/sci-calculators/galculator-2.1.3
index f773f99c8079..8d43d1916065 100644
--- a/metadata/md5-cache/sci-calculators/galculator-2.1.3
+++ b/metadata/md5-cache/sci-calculators/galculator-2.1.3
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango dev-util/intltool sys-deve
 DESCRIPTION=GTK+ based algebraic and RPN calculator
 EAPI=5
 HOMEPAGE=http://galculator.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/galculator/galculator-2.1.3.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7c12dc2d353170b0ccd92a1724303daa
+_md5_=e094bcc0658f9b32f25956aa304a89da
diff --git a/metadata/md5-cache/sci-geosciences/gempak-5.7.2_p2 b/metadata/md5-cache/sci-geosciences/gempak-5.7.2_p2
deleted file mode 100644
index bf9a91c0c39e..000000000000
--- a/metadata/md5-cache/sci-geosciences/gempak-5.7.2_p2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst setup unpack
-DESCRIPTION=GEMPAK Meteorological Plotting and Analysis Package
-EAPI=1
-HOMEPAGE=http://www.unidata.ucar.edu/packages/gempak
-KEYWORDS=x86 ~ppc
-LICENSE=as-is
-RDEPEND=>=x11-libs/motif-2.3:0
-RESTRICT=fetch
-SLOT=0
-SRC_URI=gempak_upc5.7.2p2.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8815430e85eb8b40a099684ba4a8cdba
diff --git a/metadata/md5-cache/sci-geosciences/gempak-5.7.4 b/metadata/md5-cache/sci-geosciences/gempak-5.7.4
deleted file mode 100644
index 1b5f7fab7f58..000000000000
--- a/metadata/md5-cache/sci-geosciences/gempak-5.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst setup unpack
-DEPEND=>=x11-libs/motif-2.3:0
-DESCRIPTION=GEMPAK Meteorological Plotting and Analysis Package
-EAPI=1
-HOMEPAGE=http://www.unidata.ucar.edu/packages/gempak
-KEYWORDS=~x86 ~ppc
-LICENSE=as-is
-RDEPEND=>=x11-libs/motif-2.3:0
-RESTRICT=fetch
-SLOT=0
-SRC_URI=gempak_upc5.7.4.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5d40ffdc0f3c07b94add113418a5e1a2
diff --git a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0 b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
index 67b2ab9cedb8..1c7ef6dbc769 100644
--- a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
+++ b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) >=dev-util/intltool-0.21 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) >=dev-util/intltool-0.21 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Simple program to visualize a gpx file
 EAPI=4
 HOMEPAGE=http://blog.sarine.nl/gpx-viewer/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://edge.launchpad.net/gpx-viewer/trunk/0.2.0/+download/gpx-viewer-0.3.0.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7a2f7835fda927c9645229e923979be1
diff --git a/metadata/md5-cache/sci-libs/gdal-1.10.1 b/metadata/md5-cache/sci-libs/gdal-1.10.1
index e9c42cb75400..1758d653fd3a 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.10.1
+++ b/metadata/md5-cache/sci-libs/gdal-1.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=5
 HOMEPAGE=http://www.gdal.org/
 IUSE=armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl ogdi pdf perl png postgres python ruby spatialite sqlite threads xls python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 elibc_FreeBSD java
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-libs/expat dev-libs/libpcre dev-libs/libxml2 media-libs/tiff sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) ecwj2k? ( sci-libs/libecwj2 ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) ruby? ( dev-lang/ruby:1.9 ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=ecwj2k? ( threads ) spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5285c4963fa6027bc37b488ecbe7d939
+_md5_=c9edd9c77f5375065861ff879ae612ae
diff --git a/metadata/md5-cache/sci-mathematics/Macaulay2-1.6 b/metadata/md5-cache/sci-mathematics/Macaulay2-1.6
index 0f20c66e9d0c..da4ca5b52327 100644
--- a/metadata/md5-cache/sci-mathematics/Macaulay2-1.6
+++ b/metadata/md5-cache/sci-mathematics/Macaulay2-1.6
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/gdbm dev-libs/ntl sci-mathematics/pari[gmp] >=sys-libs/readline
 SLOT=0
 SRC_URI=https://github.com/Macaulay2/M2/archive/release-1.6-stable-20130514.tar.gz -> Macaulay2-1.6.tar.gz ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-1-6.tar.gz ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/factory-3-1-6.tar.gz http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.10.1/Normaliz2.10.1.zip
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1b220123fd2341b807b19abf539dce28
+_md5_=8c0599e5f38e8f6878b057df6bede8ed
diff --git a/metadata/md5-cache/sci-mathematics/gimps-27.9-r2 b/metadata/md5-cache/sci-mathematics/gimps-27.9-r2
index d778f66ae311..6b3a43f2d3b8 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-27.9-r2
+++ b/metadata/md5-cache/sci-mathematics/gimps-27.9-r2
@@ -3,11 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=The Great Internet Mersenne Prime Search
 EAPI=4
 HOMEPAGE=http://mersenne.org/
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GIMPS
 RDEPEND=net-misc/curl
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v279.linux64.tar.gz ) x86? ( ftp://mersenne.org/gimps/p95v279.linux32.tar.gz )
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c9367a6dd9be67364906b87021f3d5f6
+_md5_=526ec70baf7b027b27ebac129efa045d
diff --git a/metadata/md5-cache/sys-apps/accountsservice-0.6.29-r1 b/metadata/md5-cache/sys-apps/accountsservice-0.6.29-r1
index d1435969a3a0..93a8347ce762 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.29-r1
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.29-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.30:2 sys-auth/polkit introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sec-policy/selinux-accountsd ) systemd? ( >=sys-apps/systemd-186 ) !systemd? ( sys-auth/consolekit ) dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) vala? ( >=dev-lang/vala-0.16.1-r1 || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.30:2 sys-auth/polkit introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sec-policy/selinux-accountsd ) systemd? ( >=sys-apps/systemd-186 ) !systemd? ( sys-auth/consolekit ) dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) vala? ( >=dev-lang/vala-0.16.1-r1 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=D-Bus interfaces for querying and manipulating user account information
 EAPI=4
 HOMEPAGE=http://www.fedoraproject.org/wiki/Features/UserAccountDialog
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30:2 sys-auth/polkit introspection? ( >=dev-libs/gobje
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.29.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6a0f36150ed3e31b69cf01bfc1650def
diff --git a/metadata/md5-cache/sys-apps/accountsservice-0.6.37 b/metadata/md5-cache/sys-apps/accountsservice-0.6.37
index a871f3914925..b167318d0175 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.37
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.37
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/AccountsService/
 IUSE=doc +introspection selinux systemd
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.37.3:2 sys-auth/polkit introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sec-policy/selinux-accountsd ) systemd? ( >=sys-apps/systemd-186:0= ) !systemd? ( sys-auth/consolekit )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.37.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4e98d1934c124d99f09900a4a0521346
+_md5_=d295e10609fdbc926a91dae98d2685b7
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.3.0 b/metadata/md5-cache/sys-apps/lmctfy-0.3.0
new file mode 100644
index 000000000000..000fbb9d371d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lmctfy-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
+DESCRIPTION=Linux application container management from Google
+EAPI=5
+HOMEPAGE=https://github.com/google/lmctfy
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
+SLOT=0
+SRC_URI=https://github.com/google/lmctfy/archive/0.3.0.tar.gz -> lmctfy-0.3.0.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=2042465281abca0b513aeacea9311feb
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.3.1 b/metadata/md5-cache/sys-apps/lmctfy-0.3.1
new file mode 100644
index 000000000000..fe77156526eb
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lmctfy-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
+DESCRIPTION=Linux application container management from Google
+EAPI=5
+HOMEPAGE=https://github.com/google/lmctfy
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
+SLOT=0
+SRC_URI=https://github.com/google/lmctfy/archive/0.3.1.tar.gz -> lmctfy-0.3.1.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=0151ea34c6f130f8898708be504fa3b1
diff --git a/metadata/md5-cache/sys-apps/systemd-208-r2 b/metadata/md5-cache/sys-apps/systemd-208-r2
deleted file mode 100644
index cd1a6964d70e..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-208-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
-DEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.0 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) filecaps? ( sys-libs/libcap ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection +kmod lzma pam policykit python qrcode selinux tcpd test vanilla xattr +filecaps abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
-SLOT=0/1
-SRC_URI=http://www.freedesktop.org/software/systemd/systemd-208.tar.xz -> systemd-208-r1.tar.xz http://dev.gentoo.org/~mgorny/dist/systemd-gentoo-patchset-208_p19.tar.bz2
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b88be3ac0fa84b8d4660463150e7aa3a
diff --git a/metadata/md5-cache/sys-apps/systemd-208-r3 b/metadata/md5-cache/sys-apps/systemd-208-r3
index bc85618e585d..c409795572e4 100644
--- a/metadata/md5-cache/sys-apps/systemd-208-r3
+++ b/metadata/md5-cache/sys-apps/systemd-208-r3
@@ -4,11 +4,11 @@ DESCRIPTION=System and service manager for Linux
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection +kmod lzma pam policykit python qrcode selinux tcpd test vanilla xattr +filecaps abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_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(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-208.tar.xz -> systemd-208-r1.tar.xz http://dev.gentoo.org/~mgorny/dist/systemd-gentoo-patchset-208_p19.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c11a0d324a94143fca164b46c172fb26
+_md5_=fc9fb2e6869888e9bc697b08dc24f252
diff --git a/metadata/md5-cache/sys-apps/systemd-208.277 b/metadata/md5-cache/sys-apps/systemd-208.277
deleted file mode 100644
index 40b00224a664..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-208.277
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
-DEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_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(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.0 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) filecaps? ( sys-libs/libcap ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection +kmod lzma pam policykit python qrcode selinux tcpd test vanilla xattr +filecaps abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_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(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
-SLOT=0/1
-SRC_URI=http://dev.gentoo.org/~mgorny/dist/systemd-208.277.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d37f3103bedc092c86b56775c7153d21
diff --git a/metadata/md5-cache/sys-apps/systemd-208.9999 b/metadata/md5-cache/sys-apps/systemd-208.9999
deleted file mode 100644
index 16331f8a4a62..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-208.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_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(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.0 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5:0 >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection +kmod lzma pam policykit python qrcode selinux tcpd test vanilla xattr +filecaps abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_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(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
-SLOT=0/1
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=80d58ac27edc3a016d2a4b98795c1869
diff --git a/metadata/md5-cache/sys-apps/systemd-212-r3 b/metadata/md5-cache/sys-apps/systemd-212-r4
similarity index 99%
rename from metadata/md5-cache/sys-apps/systemd-212-r3
rename to metadata/md5-cache/sys-apps/systemd-212-r4
index f5288271d130..e12717a5758b 100644
--- a/metadata/md5-cache/sys-apps/systemd-212-r3
+++ b/metadata/md5-cache/sys-apps/systemd-212-r4
@@ -11,4 +11,4 @@ RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0=
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-212.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=298de70bd06373dd6914d6612d0038fa
+_md5_=2fb583a09e84be4e4ab543d4ae665e6d
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 4e86f41f5a2a..b2e8fbe1c57e 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -9,4 +9,4 @@ PDEPEND=>=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/u
 RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) gudev? ( dev-libs/glib:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( app-arch/xz-utils:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) xattr? ( sys-apps/attr:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.14 !sys-fs/udev
 SLOT=0/2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b61334102ea789e286a68ea6040970a0
+_md5_=5b7f763f7bc2277cb5b2ed8853b96281
diff --git a/metadata/md5-cache/sys-apps/systemd-ui-2 b/metadata/md5-cache/sys-apps/systemd-ui-2
index 47f60e6e4f04..46c6026859ff 100644
--- a/metadata/md5-cache/sys-apps/systemd-ui-2
+++ b/metadata/md5-cache/sys-apps/systemd-ui-2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26:2 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-ui-2.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
-_md5_=42d8a45b9b12a9fe2f27699786426a5f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
+_md5_=8633eb8d6d70431afdc4608e2dbb2657
diff --git a/metadata/md5-cache/sys-apps/systemd-ui-3 b/metadata/md5-cache/sys-apps/systemd-ui-3
new file mode 100644
index 000000000000..5883d78f3681
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-ui-3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26:2 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 app-arch/xz-utils || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26:2 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/systemd/systemd-ui-3.tar.xz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
+_md5_=4692ec88756ea130ec30a1e9faad0145
diff --git a/metadata/md5-cache/sys-apps/systemd-ui-9999 b/metadata/md5-cache/sys-apps/systemd-ui-9999
index 9836a672faf5..6e738a088112 100644
--- a/metadata/md5-cache/sys-apps/systemd-ui-9999
+++ b/metadata/md5-cache/sys-apps/systemd-ui-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 app-arch/xz-utils || ( dev-lang/vala:0.22 ) app-text/docbook-xml-dtd:4.2 dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 app-arch/xz-utils || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) app-text/docbook-xml-dtd:4.2 dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=System and service manager for Linux
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
 LICENSE=GPL-2
 RDEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7
 SLOT=0
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=4d27fe1d928300195c54701da9a90668
diff --git a/metadata/md5-cache/sys-apps/uevt-2.3-r1 b/metadata/md5-cache/sys-apps/uevt-2.3-r1
index 65ff577f7d8d..d7801a16e07d 100644
--- a/metadata/md5-cache/sys-apps/uevt-2.3-r1
+++ b/metadata/md5-cache/sys-apps/uevt-2.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.28 x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 >=sys-fs/udisks-1.0.4-r5:0 >=sys-power/upower-0.9.21
 SLOT=0
 SRC_URI=http://ftp.sleipnir.fr/uevt/uevt-2.3.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
-_md5_=2604ae7d4b41749c0bb53f8d86b9c8ff
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
+_md5_=e1bd04d4c56d97b46a726367ed6be33d
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.2.12 b/metadata/md5-cache/sys-cluster/keepalived-1.2.12-r1
similarity index 60%
rename from metadata/md5-cache/sys-cluster/keepalived-1.2.12
rename to metadata/md5-cache/sys-cluster/keepalived-1.2.12-r1
index 38d325369e3f..f7b669bdc1fa 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-1.2.12
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.2.12-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-2.6.30 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl dev-libs/openssl snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-2.6.30 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
 EAPI=4
 HOMEPAGE=http://www.keepalived.org/
 IUSE=debug ipv6 snmp
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp )
+RDEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl dev-libs/openssl snmp? ( net-analyzer/net-snmp )
 SLOT=0
 SRC_URI=http://www.keepalived.org/software/keepalived-1.2.12.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=869063ad11d8528a1a9a9e7925e69aac
+_md5_=3b62cef90bb58a07ccb562469707c2c8
diff --git a/metadata/md5-cache/sys-devel/autogen-5.18.1 b/metadata/md5-cache/sys-devel/autogen-5.18.1
index 07f88be6fa39..4a30d288a234 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.1
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Program and text file generation
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/autogen/
 IUSE=libopts static-libs
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-1.8 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.18.1/autogen-5.18.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6230d6145b256c29596b4dc7ee671017
+_md5_=b6c3cfb5642d68de5940acad18182719
diff --git a/metadata/md5-cache/sys-devel/bin86-0.16.20-r2 b/metadata/md5-cache/sys-devel/bin86-0.16.20-r2
index 3db8a40287c0..14ce06b33ba0 100644
--- a/metadata/md5-cache/sys-devel/bin86-0.16.20-r2
+++ b/metadata/md5-cache/sys-devel/bin86-0.16.20-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Assembler and loader used to create kernel bootsector
 EAPI=5
 HOMEPAGE=http://v3.sk/~lkundrak/dev86/
-KEYWORDS=-* amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://v3.sk/~lkundrak/dev86/bin86-0.16.20.tar.gz https://github.com/lkundrak/dev86/commit/2c95336f19eeff761ecb858c5a2a58484bb3ceeb.patch -> bin86-0.16.20-fix_lilo_build.patch
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d82462b2c39f66cc5a1cb9fd48fce26b
+_md5_=4d1f7247370460b184f096e2003aabb8
diff --git a/metadata/md5-cache/sys-devel/smatch-1.59 b/metadata/md5-cache/sys-devel/smatch-1.59
new file mode 100644
index 000000000000..6ab709521e6a
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/smatch-1.59
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-db/sqlite
+DESCRIPTION=static analysis tool for C
+EAPI=4
+HOMEPAGE=http://smatch.sourceforge.net/
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=OSL-1.1
+RDEPEND=dev-db/sqlite
+SLOT=0
+SRC_URI=http://repo.or.cz/w/smatch.git/snapshot/1.59.tar.gz -> smatch-1.59.tar.gz mirror://gentoo/smatch-1.59.tar.gz
+_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=7abaf262d4372395efce8f8e2feb3e60
diff --git a/metadata/md5-cache/sys-devel/smatch-9999 b/metadata/md5-cache/sys-devel/smatch-9999
index acb0b66477ae..66af127b0351 100644
--- a/metadata/md5-cache/sys-devel/smatch-9999
+++ b/metadata/md5-cache/sys-devel/smatch-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install prepare unpack
+DEFINED_PHASES=compile install prepare test unpack
 DEPEND=dev-db/sqlite dev-vcs/git
 DESCRIPTION=static analysis tool for C
 EAPI=4
@@ -7,4 +7,4 @@ LICENSE=OSL-1.1
 RDEPEND=dev-db/sqlite
 SLOT=0
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8d59d8d7359910c65ab6c5a98d62d238
+_md5_=04754b241f84d25a4fb064dbcf32558c
diff --git a/metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.4.1-r1 b/metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.4.1-r1
new file mode 100644
index 000000000000..54f75e871e2c
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.4.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Firmware for the Technotrend S2-6400 DVB Card
+EAPI=5
+HOMEPAGE=http://www.aregel.de/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=app-arch/unzip
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.aregel.de/file_download/24/dvb-ttpremium-st7109-01_v0_4_1.zip http://www.aregel.de/file_download/26/dvb-ttpremium-fpga-01_v1_10.zip http://www.aregel.de/file_download/7/dvb-ttpremium-loader-01_v1_03.zip
+_md5_=959f5e056cf7a3327f83592549be8afb
diff --git a/metadata/md5-cache/sys-fs/s3ql-1.18.1 b/metadata/md5-cache/sys-fs/s3ql-1.18.1
new file mode 100644
index 000000000000..0957e9106153
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/s3ql-1.18.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/apsw-3.7.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/llfuse-0.37[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyliblzma[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] sys-fs/fuse virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] test? ( dev-python/pytest[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/rsync[xattr] virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=A full-featured file system for online data storage
+EAPI=5
+HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
+IUSE=contrib doc test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/apsw-3.7.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/llfuse-0.37[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyliblzma[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] sys-fs/fuse virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://bitbucket.org/nikratio/s3ql/downloads/s3ql-1.18.1.tar.bz2
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=7758c01a36f17532d876c4a7a4cc33e7
diff --git a/metadata/md5-cache/sys-kernel/genkernel-next-55 b/metadata/md5-cache/sys-kernel/genkernel-next-55
index 9ed63bd145d3..f211f8b6d9b4 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-next-55
+++ b/metadata/md5-cache/sys-kernel/genkernel-next-55
@@ -4,10 +4,10 @@ DESCRIPTION=Gentoo automatic kernel building scripts, reloaded
 EAPI=5
 HOMEPAGE=http://www.gentoo.org
 IUSE=cryptsetup dmraid gpg iscsi plymouth selinux
-KEYWORDS=amd64 ~arm ~ia64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/asciidoc sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) !sys-kernel/genkernel cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 ) gpg? ( app-crypt/gnupg ) iscsi? ( sys-block/open-iscsi ) plymouth? ( sys-boot/plymouth ) app-portage/portage-utils app-arch/cpio >=app-misc/pax-utils-0.6 !<sys-apps/openrc-0.9.9 sys-apps/util-linux sys-block/thin-provisioning-tools sys-fs/lvm2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~lxnay/genkernel-next/genkernel-next-55.tar.xz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=310751d5a71baf225dec7d9a32118e3e
+_md5_=c96984f76e10b7ff2b9654c140e633b8
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.56-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.58
similarity index 63%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.2.56-r1
rename to metadata/md5-cache/sys-kernel/gentoo-sources-3.2.58
index 30b975de1e88..8a6b195dd661 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.56-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.58
@@ -1,15 +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 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.2 kernel tree
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.2.56-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.56-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+SLOT=3.2.58
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-35.base.tar.xz mirror://gentoo/genpatches-3.2-35.extras.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=782add08d7d32d6bb1f25f767b57b894
+_md5_=00a0104ce0d320e910e3b483d17eda02
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.10 b/metadata/md5-cache/sys-kernel/hardened-sources-3.13.10
deleted file mode 100644
index cf4214379e79..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.13)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.13.10
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.13.10-1.extras.tar.bz2 mirror://gentoo/genpatches-3.13-13.base.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3d8bb547bffe88030211278a1964ba24
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.8-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.13.8-r1
deleted file mode 100644
index 3dff6745966e..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.13)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.13.8-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.13.8-2.extras.tar.bz2 mirror://gentoo/genpatches-3.13-11.base.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f2f169601858dfbb721fe36853da34f9
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.8-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.13.8-r2
deleted file mode 100644
index 6b1225a4cfbe..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.8-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.13)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.13.8-r2
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.13.8-3.extras.tar.bz2 mirror://gentoo/genpatches-3.13-11.base.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e3c5458058cfee1e7279f69c966ab990
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.9 b/metadata/md5-cache/sys-kernel/hardened-sources-3.13.9
deleted file mode 100644
index 91be5cff1c74..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.13.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.13)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.13.9
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-3.13 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.13.N/deblob-check -> deblob-check-3.13 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.13.9-1.extras.tar.bz2 mirror://gentoo/genpatches-3.13-12.base.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d1a1375b99ffb5f05aaf560d425be149
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.1
deleted file mode 100644
index 89a942247aee..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.14)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.1-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-4.base.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ec4b84770e2178f9c032208b72906048
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.2-r1
similarity index 91%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.14.2
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.14.2-r1
index eee67c97f21e..dcef3dca388c 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.2
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.2-r1
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.2
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.2-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-5.base.tar.xz
+SLOT=3.14.2-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.2-2.extras.tar.bz2 mirror://gentoo/genpatches-3.14-5.base.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7615bc01d2dedeaf995726b31a8209cc
+_md5_=38e5ead1d9ea377f8d489d6e71027b98
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.56-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.56-r2
deleted file mode 100644
index 251769b58a68..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.56-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.56-r2
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.56-3.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4ca5fe6d00f8c79f749c22b893fc0771
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.57-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.57-r2
deleted file mode 100644
index 48444c2c4771..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.57-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.57-r2
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.57-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ebb427977f39309f1690c591b7c6ccff
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.57-r3 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.57-r3
deleted file mode 100644
index 690497ab59d4..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.57-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.57-r3
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.57-3.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=80b4e5e72c5097a7a8d9a58a09370654
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.57 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.58
similarity index 92%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.2.57
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.2.58
index b2701d2fe5a4..cebfb4d7ac61 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.57
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.58
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.2.57
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.57-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+SLOT=3.2.58
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.58-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6769a6d4d3a7d11c64d3077ae49476af
+_md5_=9d099bac16b3407dc504ec36c7957c91
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.88.4 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.88.4
new file mode 100644
index 000000000000..323a82844f7a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.88.4
@@ -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 >=dev-lang/python-2.6.8-r3:2.6 ) )
+DESCRIPTION=Kernel sources with OpenVZ patchset
+EAPI=5
+HOMEPAGE=http://www.openvz.org
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~ppc64 ~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=2.6.32.88.4
+SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab088.4/patches/patch-042stab088.4-combined.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=f117190654424cb5f06810f4cd0821b6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.57 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.58
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.2.57
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.2.58
index 87538ffce736..98a9fe45a96a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.57
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.58
@@ -9,7 +9,7 @@ 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.2.57
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.57.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
+SLOT=3.2.58
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.58.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=166fc33e86fd5a75229b06a9701615d7
+_md5_=4e8df54fd84423286d3b41d785f9c8de
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.2.10 b/metadata/md5-cache/sys-libs/libosinfo-0.2.10
index de7e2a3505cb..7c783a3db120 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-0.2.10
+++ b/metadata/md5-cache/sys-libs/libosinfo-0.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup-gnome:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup-gnome:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) virtual/pkgconfig
 DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/libosinfo/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-li
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.10.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=ca5b31b70b9fb84dfab5843c0b1d0e12
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.2.7 b/metadata/md5-cache/sys-libs/libosinfo-0.2.7
index ac5fae205e7a..f8a536a192c0 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-0.2.7
+++ b/metadata/md5-cache/sys-libs/libosinfo-0.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup-gnome:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-libs/gobject-introspection-common dev-util/gtk-doc-am virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup-gnome:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-libs/gobject-introspection-common dev-util/gtk-doc-am virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) virtual/pkgconfig
 DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/libosinfo/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-li
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.7.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=e2d6424cd45558991b960da9f142ffff
diff --git a/metadata/md5-cache/sys-process/htop-1.0.1 b/metadata/md5-cache/sys-process/htop-1.0.1
deleted file mode 100644
index 246e70781e94..000000000000
--- a/metadata/md5-cache/sys-process/htop-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses[unicode?]
-DESCRIPTION=interactive process viewer
-EAPI=4
-HOMEPAGE=http://htop.sourceforge.net
-IUSE=elibc_FreeBSD kernel_linux openvz unicode vserver
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses[unicode?]
-SLOT=0
-SRC_URI=mirror://sourceforge/htop/htop-1.0.1.tar.gz
-_md5_=3bef8556e93b65cd13fd5d592fae396d
diff --git a/metadata/md5-cache/sys-process/htop-1.0.1-r1 b/metadata/md5-cache/sys-process/htop-1.0.1-r1
deleted file mode 100644
index eb04e2a4897e..000000000000
--- a/metadata/md5-cache/sys-process/htop-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses[unicode?]
-DESCRIPTION=interactive process viewer
-EAPI=4
-HOMEPAGE=http://htop.sourceforge.net
-IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses[unicode?]
-SLOT=0
-SRC_URI=mirror://sourceforge/htop/htop-1.0.1.tar.gz
-_md5_=6a5c429c19429e0669ac596ba9a47773
diff --git a/metadata/md5-cache/sys-process/htop-1.0.2-r1 b/metadata/md5-cache/sys-process/htop-1.0.2-r1
deleted file mode 100644
index 81125e167146..000000000000
--- a/metadata/md5-cache/sys-process/htop-1.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses[unicode?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=interactive process viewer
-EAPI=4
-HOMEPAGE=http://htop.sourceforge.net
-IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses[unicode?]
-SLOT=0
-SRC_URI=mirror://sourceforge/htop/htop-1.0.2.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=df46af4f78472f8ff8b40d28ee480d14
diff --git a/metadata/md5-cache/sys-process/htop-1.0.3 b/metadata/md5-cache/sys-process/htop-1.0.3
new file mode 100644
index 000000000000..e6cbc8752568
--- /dev/null
+++ b/metadata/md5-cache/sys-process/htop-1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/ncurses[unicode?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=interactive process viewer
+EAPI=5
+HOMEPAGE=http://hisham.hm/htop/
+IUSE=kernel_FreeBSD kernel_linux oom openvz unicode vserver
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2
+RDEPEND=sys-libs/ncurses[unicode?]
+SLOT=0
+SRC_URI=http://hisham.hm/htop/releases/1.0.3/htop-1.0.3.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=b5b1a5ef3326d70c4ac694635cb44aa1
diff --git a/metadata/md5-cache/www-apache/mod_ruby-1.3.0 b/metadata/md5-cache/www-apache/mod_ruby-1.3.0
deleted file mode 100644
index 62d3d620d64c..000000000000
--- a/metadata/md5-cache/www-apache/mod_ruby-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=dev-lang/ruby:1.8 doc? ( dev-ruby/rdtool ) =www-servers/apache-2.2*
-DESCRIPTION=Embeds the Ruby interpreter into Apache.
-EAPI=1
-HOMEPAGE=http://modruby.net/
-IUSE=doc
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/ruby:1.8 =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://modruby.net/archive/mod_ruby-1.3.0.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=830f3bfc20f80e44c4a8c46aace87802
diff --git a/metadata/md5-cache/www-apps/guacamole-0.9.0 b/metadata/md5-cache/www-apps/guacamole-0.9.0
new file mode 100644
index 000000000000..0817efa731d1
--- /dev/null
+++ b/metadata/md5-cache/www-apps/guacamole-0.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-java/maven-bin
+DESCRIPTION=Guacamole is a html5 vnc client as servlet
+EAPI=5
+HOMEPAGE=http://guacamole.sourceforge.net/
+IUSE=ldap mysql
+KEYWORDS=~x86
+LICENSE=AGPL-3
+RDEPEND=dev-java/maven-bin www-servers/tomcat >virtual/jre-1.6 net-misc/guacamole-server mysql? ( virtual/mysql ) ldap? ( net-nds/openldap )
+SLOT=0
+SRC_URI=mirror://sourceforge/guacamole/guacamole-client-0.9.0.tar.gz mysql? ( http://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-mysql-0.9.0.tar.gz ) ldap? ( http://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.9.0.tar.gz )
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=7a23b675280bc0002f44bb172d2ee610
diff --git a/metadata/md5-cache/www-client/chromium-35.0.1916.47 b/metadata/md5-cache/www-client/chromium-35.0.1916.47
deleted file mode 100644
index c78f4ca225b8..000000000000
--- a/metadata/md5-cache/www-client/chromium-35.0.1916.47
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/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/gnome-keyring-2.28.2:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:=[icu(+)] >=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/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 ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig test? ( dev-libs/openssl:0 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] test? ( dev-python/pyftpdlib[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ( >=dev-lang/python-2.6.8-r3:2.6 dev-python/simplejson[python_targets_python2_6(-),python_single_target_python2_6(+)] test? ( dev-python/pyftpdlib[python_targets_python2_6(-),python_single_target_python2_6(+)] ) ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=5
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring 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
-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/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/gnome-keyring-2.28.2:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:=[icu(+)] >=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/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-35.0.1916.47.tar.xz test? ( https://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1916.47-testdata.tar.xz )
-_eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b85fb3fe73ca7a8fb1c0c39743358c47
diff --git a/metadata/md5-cache/www-client/chromium-36.0.1941.0 b/metadata/md5-cache/www-client/chromium-36.0.1964.2
similarity index 97%
rename from metadata/md5-cache/www-client/chromium-36.0.1941.0
rename to metadata/md5-cache/www-client/chromium-36.0.1964.2
index afec04ee4fa7..c684e3840d37 100644
--- a/metadata/md5-cache/www-client/chromium-36.0.1941.0
+++ b/metadata/md5-cache/www-client/chromium-36.0.1964.2
@@ -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/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/gnome-keyring-2.28.2:= ) >=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/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.1941.0.tar.xz test? ( https://commondatastorage.googleapis.com/chromium-browser-official/chromium-36.0.1941.0-testdata.tar.xz )
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-36.0.1964.2.tar.xz test? ( https://commondatastorage.googleapis.com/chromium-browser-official/chromium-36.0.1964.2-testdata.tar.xz )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=49d4af8243fef8a2e6f187ed400a4724
+_md5_=7ce1211ca73c2859d97a7514bc9e76f6
diff --git a/metadata/md5-cache/www-client/dillo-3.0.4 b/metadata/md5-cache/www-client/dillo-3.0.4
new file mode 100644
index 000000000000..c3a924e78713
--- /dev/null
+++ b/metadata/md5-cache/www-client/dillo-3.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-libs/zlib >=x11-libs/fltk-1.3:1[-cairo] jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( dev-libs/openssl:0 ) doc? ( app-doc/doxygen )
+DESCRIPTION=Lean FLTK based web browser
+EAPI=5
+HOMEPAGE=http://www.dillo.org/
+IUSE=doc +gif ipv6 +jpeg +png ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/zlib >=x11-libs/fltk-1.3:1[-cairo] jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=http://www.dillo.org/download/dillo-3.0.4.tar.bz2 mirror://gentoo/dillo.png
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=3936808b99531a02d35ef7bf14883445
diff --git a/metadata/md5-cache/www-client/dillo-3.0.4.9999 b/metadata/md5-cache/www-client/dillo-3.0.4.9999
deleted file mode 100644
index 05c069dcc22b..000000000000
--- a/metadata/md5-cache/www-client/dillo-3.0.4.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=sys-libs/zlib >=x11-libs/fltk-1.3:1[-cairo] jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( dev-libs/openssl:0 ) doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
-DESCRIPTION=Lean FLTK based web browser
-EAPI=5
-HOMEPAGE=http://www.dillo.org/
-IUSE=doc +gif ipv6 +jpeg +png ssl
-LICENSE=GPL-3
-RDEPEND=sys-libs/zlib >=x11-libs/fltk-1.3:1[-cairo] jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( dev-libs/openssl:0 )
-SLOT=0
-SRC_URI=mirror://gentoo/dillo.png
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mercurial	6bb94b704fb44f17b02994ca3fa756a9	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0b805d62c43be1cac60c5dd273094816
diff --git a/metadata/md5-cache/www-client/midori-0.5.5 b/metadata/md5-cache/www-client/midori-0.5.5
index 2ca242fcfefd..de82b4405eac 100644
--- a/metadata/md5-cache/www-client/midori-0.5.5
+++ b/metadata/md5-cache/www-client/midori-0.5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.34:2.4 >=net-libs/libsoup-gnome-2.34:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver >=net-libs/webkit-gtk-1.8.3:2 >=x11-libs/gtk+-2.24:2 unique? ( dev-libs/libunique:1 ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.5_all_.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
 _md5_=70938e63ad888d664b2292cb227eeff6
diff --git a/metadata/md5-cache/www-client/midori-0.5.8 b/metadata/md5-cache/www-client/midori-0.5.8
index 7cad3f7ff81a..a86a85579b8a 100644
--- a/metadata/md5-cache/www-client/midori-0.5.8
+++ b/metadata/md5-cache/www-client/midori-0.5.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=net-libs/libsoup-gnome-2.38:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver deprecated? ( >=net-libs/webkit-gtk-1.8.1:2[jit=] >=x11-libs/gtk+-2.24:2 ) !deprecated? ( >=app-crypt/gcr-3 x11-libs/gtk+:3 webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] ) !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) ) granite? ( >=dev-libs/granite-0.2 ) introspection? ( dev-libs/gobject-introspection ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) dev-util/intltool gnome-base/librsvg sys-devel/gettext doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=net-libs/libsoup-gnome-2.38:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver deprecated? ( >=net-libs/webkit-gtk-1.8.1:2[jit=] >=x11-libs/gtk+-2.24:2 ) !deprecated? ( >=app-crypt/gcr-3 x11-libs/gtk+:3 webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] ) !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) ) granite? ( >=dev-libs/granite-0.2 ) introspection? ( dev-libs/gobject-introspection ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) dev-util/intltool gnome-base/librsvg sys-devel/gettext doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A lightweight web browser based on WebKitGTK+
 EAPI=5
 HOMEPAGE=http://www.midori-browser.org/
 IUSE=deprecated doc granite introspection +jit +webkit2 zeitgeist
-KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~mips ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=net-libs/libsoup-gnome-2.38:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver deprecated? ( >=net-libs/webkit-gtk-1.8.1:2[jit=] >=x11-libs/gtk+-2.24:2 ) !deprecated? ( >=app-crypt/gcr-3 x11-libs/gtk+:3 webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] ) !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) ) granite? ( >=dev-libs/granite-0.2 ) introspection? ( dev-libs/gobject-introspection ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )
 REQUIRED_USE=granite? ( !deprecated ) introspection? ( deprecated ) webkit2? ( !deprecated )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.8_all_.tar.bz2
-_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
-_md5_=e34b78b9f01220fb7cb3779d4da6a8cd
+_eclasses_=cmake-utils	7798d4361fbdd043014e635a1753e076	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
+_md5_=90869cfe77bf4d8d9b1cda10995e3ed7
diff --git a/metadata/md5-cache/www-client/seamonkey-2.26 b/metadata/md5-cache/www-client/seamonkey-2.26
new file mode 100644
index 000000000000..e4aeaa87bfcb
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.16 >=dev-libs/nspr-4.10.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.6.7[apng] >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-cairo? ( >=x11-libs/cairo-1.12[X] x11-libs/pixman ) system-icu? ( >=dev-libs/icu-51.1 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( >=dev-db/sqlite-3.8.1:3[secure-delete,debug=] ) >=media-libs/libvpx-1.3.0 crypt? ( >=app-crypt/gnupg-1.4 ) kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla ) !elibc_glibc? ( dev-libs/libexecinfo ) >=sys-devel/binutils-2.16.1 virtual/pkgconfig amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg:0 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) !<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.1* sys-devel/libtool app-arch/unzip app-arch/unzip app-arch/unzip
+DESCRIPTION=Seamonkey Web Browser
+EAPI=5
+HOMEPAGE=http://www.seamonkey-project.org
+IUSE=+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming selinux system-cairo system-icu system-jpeg system-sqlite test custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.16 >=dev-libs/nspr-4.10.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.6.7[apng] >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-cairo? ( >=x11-libs/cairo-1.12[X] x11-libs/pixman ) system-icu? ( >=dev-libs/icu-51.1 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( >=dev-db/sqlite-3.8.1:3[secure-delete,debug=] ) >=media-libs/libvpx-1.3.0 crypt? ( >=app-crypt/gnupg-1.4 ) kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg:0 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
+SLOT=0
+SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.be.langpack.xpi -> seamonkey-2.26-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.ca.langpack.xpi -> seamonkey-2.26-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.cs.langpack.xpi -> seamonkey-2.26-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.de.langpack.xpi -> seamonkey-2.26-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.en-GB.langpack.xpi -> seamonkey-2.26-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.es-AR.langpack.xpi -> seamonkey-2.26-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.es-ES.langpack.xpi -> seamonkey-2.26-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.fi.langpack.xpi -> seamonkey-2.26-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.fr.langpack.xpi -> seamonkey-2.26-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.gl.langpack.xpi -> seamonkey-2.26-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.hu.langpack.xpi -> seamonkey-2.26-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.it.langpack.xpi -> seamonkey-2.26-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.ja.langpack.xpi -> seamonkey-2.26-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.lt.langpack.xpi -> seamonkey-2.26-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.nb-NO.langpack.xpi -> seamonkey-2.26-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.nl.langpack.xpi -> seamonkey-2.26-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.pl.langpack.xpi -> seamonkey-2.26-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.pt-PT.langpack.xpi -> seamonkey-2.26-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.ru.langpack.xpi -> seamonkey-2.26-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.sk.langpack.xpi -> seamonkey-2.26-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.sv-SE.langpack.xpi -> seamonkey-2.26-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.tr.langpack.xpi -> seamonkey-2.26-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.uk.langpack.xpi -> seamonkey-2.26-uk.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.zh-CN.langpack.xpi -> seamonkey-2.26-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/langpack/seamonkey-2.26.zh-TW.langpack.xpi -> seamonkey-2.26-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.26/source/seamonkey-2.26.source.tar.bz2 -> seamonkey-2.26.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-29.0-patches-0.1.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.23-patches-01.tar.xz crypt? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-1.6.1_pre20140112.tar.xz )
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mozconfig-3	7ed5799a43f38c125f644961517e2f92	mozcoreconf-2	9b5c7bead53237c2ee27b61b12459678	mozextension	ba6829881080a663d68531424a3dfbc6	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=ffed4eb421dbbd50eebf0d3d445142a1
diff --git a/metadata/md5-cache/www-client/seamonkey-bin-2.24 b/metadata/md5-cache/www-client/seamonkey-bin-2.24
deleted file mode 100644
index f627bb822be1..000000000000
--- a/metadata/md5-cache/www-client/seamonkey-bin-2.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst unpack
-DEPEND=app-arch/unzip app-arch/unzip app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Mozilla Application Suite - web browser, email, HTML editor, IRC
-EAPI=4
-HOMEPAGE=http://www.seamonkey-project.org/
-IUSE=startup-notification linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/dbus-glib >=media-libs/alsa-lib-1.0.16 virtual/freedesktop-icon-theme >=x11-libs/gtk+-2.10:2 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu !net-libs/libproxy[spidermonkey]
-RESTRICT=strip mirror binchecks
-SLOT=0
-SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.be.langpack.xpi -> seamonkey-2.24-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.ca.langpack.xpi -> seamonkey-2.24-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.cs.langpack.xpi -> seamonkey-2.24-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.de.langpack.xpi -> seamonkey-2.24-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.en-GB.langpack.xpi -> seamonkey-2.24-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.es-AR.langpack.xpi -> seamonkey-2.24-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.es-ES.langpack.xpi -> seamonkey-2.24-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.fi.langpack.xpi -> seamonkey-2.24-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.fr.langpack.xpi -> seamonkey-2.24-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.gl.langpack.xpi -> seamonkey-2.24-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.hu.langpack.xpi -> seamonkey-2.24-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.it.langpack.xpi -> seamonkey-2.24-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.ja.langpack.xpi -> seamonkey-2.24-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.lt.langpack.xpi -> seamonkey-2.24-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.nb-NO.langpack.xpi -> seamonkey-2.24-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.nl.langpack.xpi -> seamonkey-2.24-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.pl.langpack.xpi -> seamonkey-2.24-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.pt-PT.langpack.xpi -> seamonkey-2.24-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.ru.langpack.xpi -> seamonkey-2.24-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.sk.langpack.xpi -> seamonkey-2.24-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.sv-SE.langpack.xpi -> seamonkey-2.24-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.tr.langpack.xpi -> seamonkey-2.24-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.uk.langpack.xpi -> seamonkey-2.24-uk.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.zh-CN.langpack.xpi -> seamonkey-2.24-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/langpack/seamonkey-2.24.zh-TW.langpack.xpi -> seamonkey-2.24-zh-TW.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/contrib/seamonkey-2.24.en-US.linux-x86_64.tar.bz2 -> seamonkey-bin_x86_64-2.24.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.24/linux-i686/en-US/seamonkey-2.24.tar.bz2 -> seamonkey-bin_i686-2.24.tar.bz2 )
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	mozextension	ba6829881080a663d68531424a3dfbc6	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	fac675dcccf94392371a6abee62d909f	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cb4dc43d02bca98019ab4ea0fab551f1
diff --git a/metadata/md5-cache/www-client/seamonkey-bin-2.26 b/metadata/md5-cache/www-client/seamonkey-bin-2.26
new file mode 100644
index 000000000000..c2f76aa502dd
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-bin-2.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst unpack
+DEPEND=app-arch/unzip app-arch/unzip app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Mozilla Application Suite - web browser, email, HTML editor, IRC
+EAPI=4
+HOMEPAGE=http://www.seamonkey-project.org/
+IUSE=startup-notification linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/dbus-glib >=media-libs/alsa-lib-1.0.16 virtual/freedesktop-icon-theme >=x11-libs/gtk+-2.10:2 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu !net-libs/libproxy[spidermonkey]
+RESTRICT=strip mirror binchecks
+SLOT=0
+SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.be.langpack.xpi -> seamonkey-2.26-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.ca.langpack.xpi -> seamonkey-2.26-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.cs.langpack.xpi -> seamonkey-2.26-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.de.langpack.xpi -> seamonkey-2.26-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.en-GB.langpack.xpi -> seamonkey-2.26-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.es-AR.langpack.xpi -> seamonkey-2.26-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.es-ES.langpack.xpi -> seamonkey-2.26-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.fi.langpack.xpi -> seamonkey-2.26-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.fr.langpack.xpi -> seamonkey-2.26-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.gl.langpack.xpi -> seamonkey-2.26-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.hu.langpack.xpi -> seamonkey-2.26-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.it.langpack.xpi -> seamonkey-2.26-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.ja.langpack.xpi -> seamonkey-2.26-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.lt.langpack.xpi -> seamonkey-2.26-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.nb-NO.langpack.xpi -> seamonkey-2.26-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.nl.langpack.xpi -> seamonkey-2.26-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.pl.langpack.xpi -> seamonkey-2.26-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.pt-PT.langpack.xpi -> seamonkey-2.26-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.ru.langpack.xpi -> seamonkey-2.26-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.sk.langpack.xpi -> seamonkey-2.26-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.sv-SE.langpack.xpi -> seamonkey-2.26-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.tr.langpack.xpi -> seamonkey-2.26-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.uk.langpack.xpi -> seamonkey-2.26-uk.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.zh-CN.langpack.xpi -> seamonkey-2.26-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/langpack/seamonkey-2.26.zh-TW.langpack.xpi -> seamonkey-2.26-zh-TW.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/contrib/seamonkey-2.26.en-US.linux-x86_64.tar.bz2 -> seamonkey-bin_x86_64-2.26.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.26/linux-i686/en-US/seamonkey-2.26.tar.bz2 -> seamonkey-bin_i686-2.26.tar.bz2 )
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	mozextension	ba6829881080a663d68531424a3dfbc6	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	fac675dcccf94392371a6abee62d909f	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=fdc583d7cdc564bf0578e7f475396f00
diff --git a/metadata/md5-cache/x11-drivers/radeon-ucode-20130826 b/metadata/md5-cache/x11-drivers/radeon-ucode-20130826
deleted file mode 100644
index 46a6a417b926..000000000000
--- a/metadata/md5-cache/x11-drivers/radeon-ucode-20130826
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs
-EAPI=5
-HOMEPAGE=http://people.freedesktop.org/~agd5f/radeon_ucode/
-KEYWORDS=amd64 x86
-LICENSE=radeon-ucode
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=0
-SRC_URI=mirror://gentoo/radeon-ucode-20130826.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d0f50c539f607d172b16cd0d9d1e6ec7
diff --git a/metadata/md5-cache/x11-drivers/radeon-ucode-20131111 b/metadata/md5-cache/x11-drivers/radeon-ucode-20140430
similarity index 85%
rename from metadata/md5-cache/x11-drivers/radeon-ucode-20131111
rename to metadata/md5-cache/x11-drivers/radeon-ucode-20140430
index f579b3151bb8..292868bc0c25 100644
--- a/metadata/md5-cache/x11-drivers/radeon-ucode-20131111
+++ b/metadata/md5-cache/x11-drivers/radeon-ucode-20140430
@@ -6,6 +6,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=radeon-ucode
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
-SRC_URI=mirror://gentoo/radeon-ucode-20131111.tar.xz
+SRC_URI=mirror://gentoo/radeon-ucode-20140430.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4bb4c6ade8b4c5690b2659c864fae7ff
+_md5_=d33477086ab283ef9b2bbf9d6e34f437
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.16-r3 b/metadata/md5-cache/x11-libs/cairo-1.12.16-r3
new file mode 100644
index 000000000000..ddfdb5fc8ae9
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.16-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-libs/lzo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-libs/pixman-0.28.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] directfb? ( dev-libs/DirectFB ) gles2? ( media-libs/mesa[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) glib? ( >=dev-libs/glib-2.28.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( || ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] drm? ( >=virtual/udev-136[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] gallium? ( media-libs/mesa[gallium,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) ) xcb? ( x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) virtual/pkgconfig >=sys-devel/libtool-2 X? ( x11-proto/renderproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] drm? ( x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-proto/xextproto-7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=A vector graphics library with cross-device output support
+EAPI=5
+HOMEPAGE=http://cairographics.org/
+IUSE=X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-2.1 MPL-1.1 )
+RDEPEND=dev-libs/lzo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-libs/pixman-0.28.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] directfb? ( dev-libs/DirectFB ) gles2? ( media-libs/mesa[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) glib? ( >=dev-libs/glib-2.28.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( || ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] drm? ( >=virtual/udev-136[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] gallium? ( media-libs/mesa[gallium,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) ) xcb? ( x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
+REQUIRED_USE=drm? ( X ) gallium? ( drm ) gles2? ( !opengl ) openvg? ( || ( gles2 opengl ) ) xlib-xcb? ( xcb )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://cairographics.org/releases/cairo-1.12.16.tar.xz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=5a0e8845249389a9844bb86e3ca7fcd9
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index 8db530852be5..883dbc49c5d3 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DEPEND=dev-libs/lzo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-libs/pixman-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] directfb? ( dev-libs/DirectFB ) gles2? ( media-libs/mesa[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) glib? ( >=dev-libs/glib-2.28.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( || ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] drm? ( >=virtual/udev-136[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] gallium? ( media-libs/mesa[gallium,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) ) xcb? ( x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) virtual/pkgconfig >=sys-devel/libtool-2 X? ( x11-proto/renderproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] drm? ( x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-proto/xextproto-7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 ) dev-vcs/git
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
-IUSE=X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+IUSE=X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=dev-libs/lzo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=x11-libs/pixman-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] directfb? ( dev-libs/DirectFB ) gles2? ( media-libs/mesa[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) glib? ( >=dev-libs/glib-2.28.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) opengl? ( || ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] drm? ( >=virtual/udev-136[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] gallium? ( media-libs/mesa[gallium,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) ) xcb? ( x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 REQUIRED_USE=drm? ( X ) gallium? ( drm ) gles2? ( !opengl ) openvg? ( || ( gles2 opengl ) ) xlib-xcb? ( xcb )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=458afaeab6b15f7b53e266c55160f134
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=59bfd504b935a9006e3701d1f3456393
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.1.25 b/metadata/md5-cache/x11-libs/colord-gtk-0.1.25
index 0ccb54650b0a..944681216407 100644
--- a/metadata/md5-cache/x11-libs/colord-gtk-0.1.25
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.1.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2= x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord:=[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) app-arch/xz-utils dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) )
+DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2= x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord:=[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) app-arch/xz-utils dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] ) )
 DESCRIPTION=GTK support library for colord
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-gtk-0.1.25.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=365efa94ff8e899531ece9016c1420b5
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.30.7-r1 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.30.7-r1
index 3c612161121b..7c26c22d655c 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.30.7-r1
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.30.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=+X debug +introspection jpeg jpeg2k tiff test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.37.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.7.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1823570bdbe1a511f0fcdb91307aebc8
+_md5_=650d80092549476b3d75ba45673a096c
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.14 b/metadata/md5-cache/x11-libs/goffice-0.10.14
index 97ff3170e5c0..5558021b3304 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.10.14
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.14
@@ -4,10 +4,10 @@ DESCRIPTION=A library of document-centric objects and utilities
 EAPI=5
 HOMEPAGE=http://git.gnome.org/browse/goffice/
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.28:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.9:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.2:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
 SLOT=0.10
 SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.14.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=144a92bef930ab9aaa8fdd4613a090e1
+_md5_=b8edfbf12751f8389a47f63d9bfeafa4
diff --git a/metadata/md5-cache/x11-libs/gtkglarea-2.1.0 b/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
index 9a285643fe74..26a8036a5898 100644
--- a/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
+++ b/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=OpenGL canvas and context provider for GTK+
 EAPI=5
 HOMEPAGE=http://www.mono-project.com/GtkGLArea
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.22:2 virtual/opengl
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtkglarea/2.1/gtkglarea-2.1.0.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ad00d865256e6d4b77381fd8e80517d1
+_md5_=d85a72dbc7e3930c329720b0cffac5cf
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.2-r1 b/metadata/md5-cache/x11-libs/libSM-1.2.2-r1
new file mode 100644
index 000000000000..18bd20c16107
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libICE-1.0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/xtrans x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( uuid? ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X.Org Session Management library
+EAPI=5
+HOMEPAGE=http://xorg.freedesktop.org/
+IUSE=doc ipv6 +uuid abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=>=x11-libs/libICE-1.0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/xtrans x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( uuid? ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) ) ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.2.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	88d8e0f119606a6f9fec4e723531edbf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xorg-2	69479ff7a35a30e863a475568d29b9be
+_md5_=e84910862f65ab8bb0ac15812a447ab3
diff --git a/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92 b/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92
index 79a0f7cbc0bd..3def2e65e293 100644
--- a/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92
+++ b/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=dev-libs/glib-2 dev-python/pygobject:2 dev-python/pygtk:2 x11-libs/gtk+:2 gconf? ( gnome-base/gconf:2 ) glade? ( gnome-base/libglade:2.0 ) gnome? ( gnome-base/gnome-desktop:2 ) || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] dev-lang/vala:0.10[vapigen] ) dev-libs/gobject-introspection introspection? ( x11-libs/gtk+:2[introspection] ) =dev-lang/python-2.7* dev-lang/python !dev-lang/python[-threads]
+DEPEND=>=dev-libs/glib-2 dev-python/pygobject:2 dev-python/pygtk:2 x11-libs/gtk+:2 gconf? ( gnome-base/gconf:2 ) glade? ( gnome-base/libglade:2.0 ) gnome? ( gnome-base/gnome-desktop:2 ) || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) dev-libs/gobject-introspection introspection? ( x11-libs/gtk+:2[introspection] ) =dev-lang/python-2.7* dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=A desktop-agnostic library for GLib-based projects
 EAPI=4
 HOMEPAGE=https://launchpad.net/libdesktop-agnostic
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 dev-python/pygobject:2 dev-python/pygtk:2 x11-libs/gtk+:2 gconf? ( gnome-base/gconf:2 ) glade? ( gnome-base/libglade:2.0 ) gnome? ( gnome-base/gnome-desktop:2 ) =dev-lang/python-2.7*
 SLOT=0
 SRC_URI=http://launchpad.net/libdesktop-agnostic/0.4/0.3.92/+download/libdesktop-agnostic-0.3.92.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
 _md5_=c945c233784d9785216837cbb653fc4b
diff --git a/metadata/md5-cache/x11-libs/libfm-1.1.4 b/metadata/md5-cache/x11-libs/libfm-1.1.4
index 6de8ee6eb578..baf1694ef402 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.1.4
+++ b/metadata/md5-cache/x11-libs/libfm-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3
 REQUIRED_USE=udisks? ( automount )
 SLOT=0/4.7.1
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.1.4.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=ce1b0ae67438f707323cbfcb9d57e503
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.0 b/metadata/md5-cache/x11-libs/libfm-1.2.0
index 3f2fb83d6f2d..63b0addd2985 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.2.0
+++ b/metadata/md5-cache/x11-libs/libfm-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3
 REQUIRED_USE=udisks? ( automount )
 SLOT=0/4.0.0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.2.0.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=ac875668e9c66e85be9ce64b59219532
diff --git a/metadata/md5-cache/x11-libs/libfm-9999 b/metadata/md5-cache/x11-libs/libfm-9999
index df59113206b9..6d5067684b5f 100644
--- a/metadata/md5-cache/x11-libs/libfm-9999
+++ b/metadata/md5-cache/x11-libs/libfm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= !lxde-base/lxshortcut x11-misc/shared-mime-info automount? ( udisks? ( || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] ) ) !udisks? ( gnome-base/gvfs[udev] ) )
 REQUIRED_USE=udisks? ( automount )
 SLOT=0/4.0.0
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	2027b81a576527fa16bece425941e094	git-r3	e83b3dde426430f34178059a8de5299d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=a60c4521536309e2d442cdecd918ccc4
diff --git a/metadata/md5-cache/x11-libs/libmatewnck-1.6.1 b/metadata/md5-cache/x11-libs/libmatewnck-1.6.1
index 9634ac68c7c4..b5eb2a243512 100644
--- a/metadata/md5-cache/x11-libs/libmatewnck-1.6.1
+++ b/metadata/md5-cache/x11-libs/libmatewnck-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=A window navigation construction kit for MATE
 EAPI=5
 HOMEPAGE=http://www.mate-desktop.org/
 IUSE=X +introspection startup-notification
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.16:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.19.7:2[introspection?] x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXres:0 x11-libs/pango:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.14:0 ) startup-notification? ( >=x11-libs/startup-notification-0.4:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/libmatewnck-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5f851905ec96d2abcc26860c30430a6b
+_md5_=e8228c4454127ffa0a9d842f2c536cf1
diff --git a/metadata/md5-cache/x11-misc/alltray-0.7.5.1 b/metadata/md5-cache/x11-misc/alltray-0.7.5.1
index a95e73061fc3..4c322b7bdf45 100644
--- a/metadata/md5-cache/x11-misc/alltray-0.7.5.1
+++ b/metadata/md5-cache/x11-misc/alltray-0.7.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An application which allows any application to be docked into the system notification area
 EAPI=4
 HOMEPAGE=http://alltray.trausch.us/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1
 SLOT=0
 SRC_URI=http://code.launchpad.net/alltray/trunk/0.7.5.1dev/+download/alltray-0.7.5.1dev.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=825cc2e6be08b4d6a341659843ee3d6f
diff --git a/metadata/md5-cache/x11-misc/colord-1.0.3 b/metadata/md5-cache/x11-misc/colord-1.0.3
index e1efe91ca5ae..408980bd4300 100644
--- a/metadata/md5-cache/x11-misc/colord-1.0.3
+++ b/metadata/md5-cache/x11-misc/colord-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.32.0:2 >=media-libs/lcms-2.5:2= >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.32.0:2 >=media-libs/lcms-2.5:2= >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -11,5 +11,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-1.0.3.tar.xz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=013dddc26e29f48ad580cf1211bfd1c8
diff --git a/metadata/md5-cache/x11-misc/colord-1.2.0 b/metadata/md5-cache/x11-misc/colord-1.2.0
index 2f49fa789e43..e0127be5346f 100644
--- a/metadata/md5-cache/x11-misc/colord-1.2.0
+++ b/metadata/md5-cache/x11-misc/colord-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.5:2= >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.5:2= >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -11,5 +11,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-1.2.0.tar.xz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	d8f392783fdc2395fc64af046f2ca961
 _md5_=dd6d595a15e5308aee208ebcf1c4b925
diff --git a/metadata/md5-cache/x11-misc/dockmanager-0.1.0 b/metadata/md5-cache/x11-misc/dockmanager-0.1.0
index 87f71b668caf..2110cfbd75ad 100644
--- a/metadata/md5-cache/x11-misc/dockmanager-0.1.0
+++ b/metadata/md5-cache/x11-misc/dockmanager-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libdesktop-agnostic || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) virtual/pkgconfig >=sys-apps/sed-4 =dev-lang/python-2*
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libdesktop-agnostic || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig >=sys-apps/sed-4 =dev-lang/python-2*
 DESCRIPTION=dock-independent helper scripts
 EAPI=3
 HOMEPAGE=https://launchpad.net/dockmanager
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libdesktop-agnostic =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://launchpad.net/dockmanager/trunk/0.1.0/+download/dockmanager-0.1.0.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=60323da4b3f4042e4aca6499353add17
diff --git a/metadata/md5-cache/x11-misc/mate-menu-editor-1.6.0 b/metadata/md5-cache/x11-misc/mate-menu-editor-1.6.0
index 71a0d3f027a5..d54fdbbd3236 100644
--- a/metadata/md5-cache/x11-misc/mate-menu-editor-1.6.0
+++ b/metadata/md5-cache/x11-misc/mate-menu-editor-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mozo menu editor for MATE
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/pygobject-2.15.1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2.13:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6:0[introspection,python] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=mate-base/mate-panel-1.6:0 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:2[introspection] virtual/libintl:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-menu-editor-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a652599e13f7aaa87adf555f1374b3f1
+_md5_=02abc276fb95e909e4674a0e35856327
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.6.1 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.6.1
index ecca4648aa1d..5aea1066e238 100644
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.6.1
+++ b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=MATE Notification daemon
 EAPI=5
 HOMEPAGE=http://mate-dekstop.org
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.18:2 >=media-libs/libcanberra-0.4:0[gtk] >=sys-apps/dbus-1:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/libmatewnck-1.6:0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:*
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-notification-daemon-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4d561c414c92ff78899224fb060d9bee
+_md5_=78773bc6da32028b3a40ea1719c0933e
diff --git a/metadata/md5-cache/x11-misc/py3status-1.5 b/metadata/md5-cache/x11-misc/py3status-1.5
new file mode 100644
index 000000000000..94f9840e8ae0
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/py3status-1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-misc/i3status dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=py3status is an extensible i3status wrapper written in python
+EAPI=5
+HOMEPAGE=https://github.com/ultrabug/py3status
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=x11-misc/i3status python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/ultrabug/py3status/archive/1.5.tar.gz -> py3status-1.5.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	1356c4bb8f56765cff4b74c0128d2a4f	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=4c9b44174c2d52abae62eb094579ec8b
diff --git a/metadata/md5-cache/x11-misc/suxpanel-0.4b-r3 b/metadata/md5-cache/x11-misc/suxpanel-0.4b-r3
deleted file mode 100644
index 36fccf3f3ca1..000000000000
--- a/metadata/md5-cache/x11-misc/suxpanel-0.4b-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 x11-libs/libwnck:1 virtual/pkgconfig
-DESCRIPTION=SuxPanel is a complete rewrite of MacOS Style Panel, a light-weight X11 desktop panel
-EAPI=2
-HOMEPAGE=http://suxpanel.berlios.de
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/libwnck:1
-SLOT=0
-SRC_URI=mirror://berlios/suxpanel/suxpanel-0.4b.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d8bc23c5ba6c621a5a19f758fb5e48d0
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.6.2 b/metadata/md5-cache/x11-terms/mate-terminal-1.6.2
index a27e9606e27a..2d4827bca643 100644
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.6.2
+++ b/metadata/md5-cache/x11-terms/mate-terminal-1.6.2
@@ -3,10 +3,10 @@ DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.25:2 >=gnome-base/dcon
 DESCRIPTION=The MATE Terminal
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.25:2 >=gnome-base/dconf-0.10:0 >=mate-base/mate-desktop-1.6:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/vte-0.25.91:0
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-terminal-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7d1ace6a64a566c5a49feea9b584029d
+_md5_=7f281e78a1c7a8b47e4dbde48cf357b5
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.20 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.20
index 3c6b22594403..02c3915c8f58 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.20
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.20
@@ -4,7 +4,7 @@ DESCRIPTION=rxvt clone with xft and unicode support
 EAPI=4
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
 IUSE=256-color alt-font-width blink buffer-on-clear +focused-urgency fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel startup-notification xft unicode3 +vanilla wcwidth
-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
+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
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.7-r6 kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXrender xft? ( x11-libs/libXft )
 REQUIRED_USE=vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.20.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1fa21956f213f29f4e928e0af25bcba6
+_md5_=b58c9d4a66aa846d035a4480b4684062
diff --git a/metadata/md5-cache/x11-terms/valaterm-0.6 b/metadata/md5-cache/x11-terms/valaterm-0.6
index 085389fb659f..4e62daffa3e9 100644
--- a/metadata/md5-cache/x11-terms/valaterm-0.6
+++ b/metadata/md5-cache/x11-terms/valaterm-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:3 x11-libs/vte:2.90 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-lang/python !dev-lang/python[-threads]
+DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:3 x11-libs/vte:2.90 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=A lightweight vala based terminal
 EAPI=4
 HOMEPAGE=http://gitorious.org/valaterm
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:3 x11-libs/vte:2.90
 SLOT=0
 SRC_URI=http://gitorious.org/valaterm/valaterm/archive-tarball/0.6 -> valaterm-0.6.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
 _md5_=b7386ea307ebcfdb0e9a927411742682
diff --git a/metadata/md5-cache/x11-themes/mate-backgrounds-1.6.1 b/metadata/md5-cache/x11-themes/mate-backgrounds-1.6.1
index e1c298478d42..a55726711f34 100644
--- a/metadata/md5-cache/x11-themes/mate-backgrounds-1.6.1
+++ b/metadata/md5-cache/x11-themes/mate-backgrounds-1.6.1
@@ -3,9 +3,9 @@ DEPEND=>=dev-util/intltool-0.35:* sys-devel/gettext:* app-arch/xz-utils >=sys-ap
 DESCRIPTION=A set of backgrounds packaged with the MATE desktop
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-backgrounds-1.6.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=84059967a393101e62eabb587202b34c
+_md5_=e750c359fe9fabc29805e11e4b74d386
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.6.3 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.6.3
index 169e956154fc..1b588df68e29 100644
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-1.6.3
+++ b/metadata/md5-cache/x11-themes/mate-icon-theme-1.6.3
@@ -3,11 +3,11 @@ DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=dev-util/intltool-0.40:* >=x11-mis
 DESCRIPTION=MATE default icon themes
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.3.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=13f73ec1c14d1b952e7c80bfdfd12fa0
+_md5_=dbb56724701cf5366e4e7eeacf5d1b80
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.6.0 b/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.6.0
index 968b4d0bfd64..079bd2b98b56 100644
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.6.0
+++ b/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Faenza icon theme, that was adapted for MATE desktop
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=minimal debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=x11-themes/mate-icon-theme-1.6:0 ) x11-themes/hicolor-icon-theme:0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-faenza-1.6.0.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=512a8994cbdee5c88d49ed98619f173f
+_md5_=8d0ae35f6ac0759ff42c5fa61ac63e4e
diff --git a/metadata/md5-cache/x11-themes/mate-themes-1.6.3 b/metadata/md5-cache/x11-themes/mate-themes-1.6.3
index 7d7466503f4b..773485524dcd 100644
--- a/metadata/md5-cache/x11-themes/mate-themes-1.6.3
+++ b/metadata/md5-cache/x11-themes/mate-themes-1.6.3
@@ -3,11 +3,11 @@ DEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 >=x11-themes/gtk-engines-2.
 DESCRIPTION=A set of MATE themes, with sets for users with limited or low vision
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/murrine-themes:0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.3.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=514a958afcd59ea16677b1dfdb67239a
+_md5_=248a152deb9a29a1f631d3a973c0df66
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.17.6 b/metadata/md5-cache/x11-wm/enlightenment-0.17.6
index 41ec7ff7406f..076fbf846458 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.17.6
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.17.6
@@ -4,10 +4,10 @@ DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=pam spell static-libs +udev ukit +enlightenment_modules_conf-applications +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-edgebindings +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-keybindings +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers enlightenment_modules_access +enlightenment_modules_backlight +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_comp +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_dropshadow +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_illume2 +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_winlist +enlightenment_modules_wizard +enlightenment_modules_xkbswitch nls doc
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) || ( >=dev-libs/efl-1.8.4[X,eet,jpeg,png] >=dev-libs/efl-1.8.4[xcb,eet,jpeg,png] ) >=dev-libs/e_dbus-1.7.10 ukit? ( >=dev-libs/e_dbus-1.7.10[udev] ) x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.17.6
 SRC_URI=http://download.enlightenment.org/releases/enlightenment-0.17.6.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	enlightenment	6aee6d669b6c495a4e151bd1bd85e57c	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1e4150ed9ac57ba6a59d97ad278d5dec
+_md5_=9a30f2f423ef4c1df7cb7b7ca7e9ebb4
diff --git a/metadata/md5-cache/x11-wm/mate-window-manager-1.6.2 b/metadata/md5-cache/x11-wm/mate-window-manager-1.6.2
index c31638a1464c..fa0653f0617c 100644
--- a/metadata/md5-cache/x11-wm/mate-window-manager-1.6.2
+++ b/metadata/md5-cache/x11-wm/mate-window-manager-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=MATE default window manager
 EAPI=5
 HOMEPAGE=http://mate-desktop.org
 IUSE=startup-notification test xinerama
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.25.10:2 >=mate-extra/mate-dialogs-1.6:0 media-libs/libcanberra:0[gtk] >=gnome-base/libgtop-2:2 x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.2:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 xinerama? ( x11-libs/libXinerama:0 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.6/mate-window-manager-1.6.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9c0f1bb06da7bb81a828f60f8c8110d1
+_md5_=3851818ac8f2960a7e5cafae82bf71a2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3
index ee55e20289f5..85a9bde5c55e 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( dev-lang/vala:0.20[vapigen] ) >=xfce-base/exo-0.10 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	xfconf	20671cc91311ca7e3446047c1175cf16
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	xfconf	20671cc91311ca7e3446047c1175cf16
 _md5_=9ca84f7b88c8e5e6e2de6fd63c2f3312
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 948290d48c8d..c90084d3d432 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 02 May 2014 18:37:05 +0000
+Sun, 04 May 2014 15:07:31 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 358779ce1acb..c0b424d499d2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri May  2 18:37:02 UTC 2014
+Sun May  4 15:07:28 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4d40141fb61c..f7af62f04045 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 02 May 2014 19:00:01 +0000
+Sun, 04 May 2014 15:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3248ca54244d..25ba6449d341 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1399055701 Fri 02 May 2014 06:35:01 PM UTC UTC
+1399215901 Sun 04 May 2014 03:05:01 PM UTC UTC
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index cdfbe699e204..9f4958c5e7c9 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -1,2 +1,3 @@
 DIST argus-clients-3.0.6.2.tar.gz 2426454 SHA256 f51d7c8d18fa2236f3fe3726deb3c0b8308c0a6ca767c6089811963da95330fc SHA512 bd386fc8561f2c20bac287e4f562cc980935150ea0a987b281d2b952366ccc56ca380723517d5ccd31fd430605e2d6ed9b08f0d8ca88fc3a3bb96ee495f3c36a WHIRLPOOL f1123438afa10f01c14b7aa8bc90766974bae514bf0d41377627f189ba3dab7bca69870eff0f9e8a1e87ac257e97ae2cb9e6eb6ace3022c9697949820a54dab8
 DIST argus-clients-3.0.7.21.tar.gz 2603851 SHA256 631c3e45aafac377ee8ee02232e35cddad9ab3e7dc9d8c3f63275556c1b6f186 SHA512 df38a27f10a58a7ef8b2ecf58eaa81d05b488d52feb007b75499fb43641544a96906a903acaef4f149fe5193071d29894158c928b63f5f06149e8680bf106229 WHIRLPOOL 4defd4dc0ef6216088bb18f0db9955bf3c2146d4b39ad3b62357ee26483c372dfd8465ad4c4f8e1ebd604ce3c6ec0abd61241ea3a5319d3e19f9e2b4200ae017
+DIST argus-clients-3.0.7.26.tar.gz 2601007 SHA256 9060b9224a02f7c74db4d9f6ba58b0ed5cc4c556c61587c5b3b0bf9c25b2e15d SHA512 968700c14b590420d99938d0e0a02d0106c98314e5b8a44d91057e67878b05692c40addc5f950556f7b3903145b28044623a3c85b9da7129f7a4529f09e4d930 WHIRLPOOL c203b794ad5b020e1212474fa674dea3a1a8c90c12b3856bce63ad5a86db0f669c0ee9594e6f1414c4ec719db6cf46af34a860504c8df4364943ec3938fe0014
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.26.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.26.ebuild
new file mode 100644
index 000000000000..2570705970ad
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.7.26.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.26.ebuild,v 1.1 2014/05/03 21:14:37 jer Exp $
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ft geoip mysql sasl tcpd"
+
+MY_CDEPEND="
+	net-analyzer/rrdtool[perl]
+	net-libs/libpcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	ft? ( net-analyzer/flow-tools )
+	geoip? ( dev-libs/geoip )
+	mysql? ( virtual/mysql )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+
+RDEPEND="
+	${MY_CDEPEND}
+"
+
+DEPEND="
+	${MY_CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.7.18-sasl.patch \
+		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
+
+	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
+	tc-export AR RANLIB
+
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug
+	econf \
+		$(use_with ft libft) \
+		$(use_with geoip GeoIP /usr/) \
+		$(use_with sasl) \
+		$(use_with tcpd wrappers) \
+		$(use_with mysql)
+}
+
+src_compile() {
+	# racurses uses both libncurses and libtinfo, if present
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		RANLIB=$(tc-getRANLIB) \
+		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dobin bin/ra*
+	dodoc ChangeLog CREDITS README CHANGES
+	doman man/man{1,5}/*
+}
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index e94513e0f972..c0302c0ec6a7 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -1,2 +1,3 @@
-DIST darkstat-3.0.715.tar.bz2 110881 SHA256 4926944ee1baee032d0d20a5425b13b471625aa8a05177011f3da3c3df833439
+DIST darkstat-3.0.715.tar.bz2 110881 SHA256 4926944ee1baee032d0d20a5425b13b471625aa8a05177011f3da3c3df833439 SHA512 62843cba6976a79a9dc87ebbfeaffc0589f9157b329ccf54e110b8e135791fea533d3fc73ebb324796fa5626ab16ac55d36099e5223b21ebeede5d0317b900f8 WHIRLPOOL 2cb467cfb4c03e89b9af1e1a11884e250e286db32fe178a073040cedc025f0df19de0ecf9a119e3bf74147c4c97cbcb33c6292e8f55f1fde207cdd1c3165e377
 DIST darkstat-3.0.717.tar.bz2 112436 SHA256 9933b67a0aefec5ed3e1c7db4ee33a3c52a1faef219b5c862e4b7b4bb671d8ad SHA512 d3f04b5b7977560f1c62d91cbcfd994f4c8737929d951f659dc6c35b109aef03310c98abd3e02fccc397861fb7847a6542fe4313f2d10909a80cd9b041d3c545 WHIRLPOOL 0a8d34e621fb8c857975fbd3fb5273bace129b0016d56b3fe1aeb94e0f1b9d35662fc05fefa96fbb5529736ff55dfc1debbcf57a95ede89aecf03f1e4259bd00
+DIST darkstat-3.0.718.tar.bz2 116044 SHA256 682f3e53f4e89ea6ad08236b4225a5e0859428299765d8d995374cd7fa22adff SHA512 73ed670a9c684b2f0b087da3f238c2828407c82201d1bff945a3d711bbaa231b9d87ddc9e21aa855abcd7d63c27f8f529f5a2c6fb48f52a3f0b6e88c49d33969 WHIRLPOOL 9e91c4508dc43ea5c59b10c51b1b345a4bcf31befa532a94ba435b10f8b63a2fd3e2e8775b67a40e48dcf0e91f71c7ccc191a78d337990990761671f8aa4377f
diff --git a/net-analyzer/darkstat/darkstat-3.0.718.ebuild b/net-analyzer/darkstat/darkstat-3.0.718.ebuild
new file mode 100644
index 000000000000..1638efdf2ebd
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.718.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-3.0.718.ebuild,v 1.1 2014/05/04 14:10:51 jer Exp $
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Network traffic analyzer with cute web interface"
+HOMEPAGE="http://unix4lyfe.org/darkstat/"
+SRC_URI="http://unix4lyfe.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
+
+DOCS=( AUTHORS ChangeLog README NEWS )
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	econf --disable-debug --with-privdrop-user=darkstat
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/darkstat-init.new darkstat
+	newconfd "${FILESDIR}"/darkstat-confd.new darkstat
+
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat
+
+	keepdir "${DARKSTAT_CHROOT_DIR}"
+	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
+}
+
+pkg_preinst() {
+	enewuser darkstat
+}
+
+pkg_postinst() {
+	# Workaround bug #141619
+	DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
+	chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
+
+	elog "To start different darkstat instances which will listen on a different"
+	elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
+	elog "darkstat script where 'if' is the name of the interface."
+	elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
+	elog "and edit it to change default values."
+	elog
+	elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
+}
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.13.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.13.ebuild
index 569bcbffd4ab..1301746dba94 100644
--- a/net-analyzer/fail2ban/fail2ban-0.8.13.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.8.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-analyzer/fail2ban/fail2ban-0.8.13.ebuild,v 1.3 2014/04/25 11:30:35 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.13.ebuild,v 1.4 2014/05/04 08:28:12 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="selinux? ( sec-policy/selinux-fail2ban )"
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index a71d6484a201..0fc4054e86ca 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.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/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild,v 1.2 2013/11/05 20:39:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild,v 1.3 2014/05/04 12:57:45 chithanh Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -30,7 +30,6 @@ RDEPEND="qt4? (
 		dev-qt/qtopengl:4
 	)
 	>=net-wireless/gnuradio-3.7_rc:0=[qt4?,wxwidgets?]
-	net-wireless/gr-osmosdr
 	glfw? ( >=media-libs/glfw-3 )
 	virtual/opencl
 	virtual/opengl
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
index 26818c9c320f..8844323d18c1 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.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/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild,v 1.7 2014/02/20 15:24:38 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild,v 1.9 2014/05/03 20:46:58 zlogene Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 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="doc"
 
 RESTRICT="test"
diff --git a/net-analyzer/mate-netspeed/mate-netspeed-1.6.1.ebuild b/net-analyzer/mate-netspeed/mate-netspeed-1.6.1.ebuild
index 1739545cf1d2..1b8ef8e3d0b1 100644
--- a/net-analyzer/mate-netspeed/mate-netspeed-1.6.1.ebuild
+++ b/net-analyzer/mate-netspeed/mate-netspeed-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/net-analyzer/mate-netspeed/mate-netspeed-1.6.1.ebuild,v 1.1 2014/03/19 16:41:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mate-netspeed/mate-netspeed-1.6.1.ebuild,v 1.2 2014/05/04 14:55:23 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # FIXME: wireless-tools >= 28pre9 is automagic
 RDEPEND="dev-libs/glib:2
diff --git a/net-analyzer/nb/Manifest b/net-analyzer/nb/Manifest
index 9a9fa1d0bd4f..1cfd8b654b6a 100644
--- a/net-analyzer/nb/Manifest
+++ b/net-analyzer/nb/Manifest
@@ -1,2 +1,2 @@
-DIST nb-0.6.5-source.tar.gz 558732 SHA256 fb8e0de88cd87dee81b6952d613b7010acecae35fc94a353198efc9cd5da9048
 DIST nodebrain-0.8.14.tar.gz 2081431 SHA256 f85d90e15a04cc77286027ba8a95764dfd6195343337dda43829a1b6e7caaea2 SHA512 1e863531e970611186caf5a6847535a6f11890b59ca9c91bfc78827e1e1c4d425b5e63244e9b527fa417ee7b34b29e920a7df14a85dc5d9c78a06f73d5437d66 WHIRLPOOL 8596dca2fcfcf8ea7085cfa6d39025ef8ed0536898db7a5192d4b92694b9f459b4714d9e911fc7e2e1415791e6c146012b86bbc2fc25d5fbc13a234a6fff9305
+DIST nodebrain-0.8.16.tar.gz 1709486 SHA256 91e97f44a0fd9b899ad1ae874617f339ec5586e00292eba28f9abed16b4afad1 SHA512 bbc1944ab734754008f0651b72fbcb10da40758ceceaae0f560257399ce2f9f4600d39dc2ce8fc09df11cfc14876b7b4c1f566654285163f2fa8ab369b79806d WHIRLPOOL 3cdd6be80cf44f62e81ad12a567c2d3a232b880a3c5fcc0fd4ceb9b715e1e0ebe14804ec58409bc18d7a825b3b2f718a304e5520b50a14c3e054d000e55dbd92
diff --git a/net-analyzer/nb/files/nb-0.6.5-CFLAGS-as-needed.patch b/net-analyzer/nb/files/nb-0.6.5-CFLAGS-as-needed.patch
deleted file mode 100644
index 8ee4b5195047..000000000000
--- a/net-analyzer/nb/files/nb-0.6.5-CFLAGS-as-needed.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-=== modified file 'Makefile.am'
---- Makefile.am	2008-11-16 20:06:01 +0000
-+++ Makefile.am	2008-11-16 20:20:44 +0000
-@@ -74,23 +74,23 @@
- # to depend on the nb executable use "nb${EXEEXT}"
- 
- nb_mod_simple.${NB_MOD_SUFFIX}: nbapi.h nb_mod_simple.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_simple.c -o nb_mod_simple.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_simple.c -o nb_mod_simple.${NB_MOD_SUFFIX}
- nb_mod_tree.${NB_MOD_SUFFIX}: nbapi.h nb_mod_tree.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_tree.c -o nb_mod_tree.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_tree.c -o nb_mod_tree.${NB_MOD_SUFFIX}
- nb_mod_console.${NB_MOD_SUFFIX}: nb${EXEEXT} nb.h nb_mod_console.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_console.c -o nb_mod_console.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_console.c -o nb_mod_console.${NB_MOD_SUFFIX}
- nb_mod_netflow.${NB_MOD_SUFFIX}: nbapi.h nb_mod_netflow.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_netflow.c -o nb_mod_netflow.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_netflow.c -o nb_mod_netflow.${NB_MOD_SUFFIX}
- nb_mod_snmptrap.${NB_MOD_SUFFIX}: nbapi.h nb_mod_snmptrap.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_snmptrap.c -o nb_mod_snmptrap.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_snmptrap.c -o nb_mod_snmptrap.${NB_MOD_SUFFIX}
- nb_mod_syslog.${NB_MOD_SUFFIX}: nbapi.h nb_mod_syslog.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_syslog.c -o nb_mod_syslog.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_syslog.c -o nb_mod_syslog.${NB_MOD_SUFFIX}
- nb_mod_translate.${NB_MOD_SUFFIX}: nbapi.h nb_mod_translate.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_translate.c -o nb_mod_translate.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_translate.c -o nb_mod_translate.${NB_MOD_SUFFIX}
- nb_mod_cache.${NB_MOD_SUFFIX}: nb${EXEEXT} nb.h nb_mod_cache.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_cache.c -o nb_mod_cache.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_cache.c -o nb_mod_cache.${NB_MOD_SUFFIX}
- nb_mod_servant.${NB_MOD_SUFFIX}: nb${EXEEXT} nbapi.h nb_mod_servant.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_servant.c -o nb_mod_servant.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_servant.c -o nb_mod_servant.${NB_MOD_SUFFIX}
- 
- # CLEANFILES = bin/nb_mod_<module>.${NB_MOD_SUFFIX}
- 
-
-=== modified file 'configure.ac'
---- configure.ac	2008-11-16 20:06:01 +0000
-+++ configure.ac	2008-11-16 20:13:16 +0000
-@@ -117,7 +117,6 @@
- NB_MOD_PATH="/usr/local/lib/${PACKAGE_NAME}"
- NB_MOD_PATH_SEPARATOR=":"
- NB_MOD_SUFFIX="so"
--CFLAGS=
- case "$host" in
-   *-netbsd*)
-     AC_DEFINE(NETBSD,,[Define if NetBSD])
-@@ -144,7 +143,8 @@
-   *-linux*)
-     AC_DEFINE(LINUX,,[Define if LINUX])
-     CFLAGS="${CFLAGS} -rdynamic"
--    LDFLAGS="${LDFLAGS} -ldl -lm"
-+    LDFLAGS="${LDFLAGS}"
-+    LIBS=" -ldl -lm"
-     ;;
-   *-hpux*)
-     AC_DEFINE(HPUX,,[Define if HPUX])
-
diff --git a/net-analyzer/nb/nb-0.6.5-r1.ebuild b/net-analyzer/nb/nb-0.6.5-r1.ebuild
deleted file mode 100644
index ff27b793f822..000000000000
--- a/net-analyzer/nb/nb-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.6.5-r1.ebuild,v 1.3 2011/10/27 18:42:06 jer Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
-HOMEPAGE="http://nodebrain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nodebrain/${P}-source.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="
-	!sys-boot/netboot
-	!www-apps/nanoblogger
-"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-CFLAGS-as-needed.patch"
-	eautoreconf
-}
-
-src_install() {
-	#DIR="${D}/usr" ./install-nb || die "install failed"
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README THANKS sample/*
-	dohtml html/*
-}
diff --git a/net-analyzer/nb/nb-0.8.14.ebuild b/net-analyzer/nb/nb-0.8.14.ebuild
index 85f3bab5fffa..e2e438e532d3 100644
--- a/net-analyzer/nb/nb-0.8.14.ebuild
+++ b/net-analyzer/nb/nb-0.8.14.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/net-analyzer/nb/nb-0.8.14.ebuild,v 1.2 2013/03/09 18:23:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.14.ebuild,v 1.3 2014/05/03 21:30:16 jer Exp $
 
 EAPI=5
 inherit autotools eutils
 
-DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
+DESCRIPTION="Nodebrain is a tool to monitor and do event correlation"
 HOMEPAGE="http://nodebrain.sourceforge.net/"
 SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
 
diff --git a/net-analyzer/nb/nb-0.8.16.ebuild b/net-analyzer/nb/nb-0.8.16.ebuild
new file mode 100644
index 000000000000..fbc0f8899cdf
--- /dev/null
+++ b/net-analyzer/nb/nb-0.8.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.16.ebuild,v 1.1 2014/05/03 21:30:16 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Nodebrain is a tool to monitor and do event correlation"
+HOMEPAGE="http://nodebrain.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	sys-apps/texinfo
+"
+RDEPEND="
+	!sys-boot/netboot
+	!www-apps/nanoblogger
+"
+
+S="${WORKDIR}/nodebrain-${PV}"
+
+src_prepare() {
+	# fdl.texi is not included in the sources
+	sed -i \
+		-e '/@include fdl.texi/d' \
+		doc/nbTutorial/nbTutorial.texi || die
+
+	epatch "${FILESDIR}"/${PN}-0.8.14-include.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--include=/usr/include
+}
+
+src_compile() {
+	# Fails at parallel make
+	emake -j1
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+	dodoc AUTHORS NEWS README THANKS sample/*
+	dohtml html/*
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_pre3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_pre3.ebuild
index 35b242d09b7d..dd872e445719 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3_pre3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3_pre3.ebuild
@@ -1,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/net-snmp/net-snmp-5.7.3_pre3.ebuild,v 1.5 2014/04/30 23:14:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.7.3_pre3.ebuild,v 1.6 2014/05/03 14:19:36 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
 # GPL-2 for the init scripts
 LICENSE="HPND BSD 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="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
 
 COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
diff --git a/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild b/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild
index 95889cf25968..05b0527b370e 100644
--- a/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.8.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/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild,v 1.1 2014/02/17 00:44:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild,v 1.2 2014/05/03 14:10:14 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index 7908d59151d7..0c41c2d7928f 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -1,2 +1,2 @@
-DIST sec-2.6.2.tar.gz 100464 SHA256 d2f4877a79a04042f39c30390be46c4334b9141945f606935a40f1a9455a9948 SHA512 55c50f3a3233100f22adff8412335951bc1af1e328f7fc0a15d41753e42f21b18ca202945281d968dab7d9b7f0e165dde2228621fda57562a9dc01679189b336 WHIRLPOOL 3bad57cb5bb2ccb215b548ca3edd2f41a43c57e51644fa7a84dfbf3b1e7df47938104bd238de540568af057207c8d65e1c4d3fa38ebd677588df7403a6abddb1
 DIST sec-2.7.0.tar.gz 105388 SHA256 85e9f0356b90591f05f5057dd92b780081caf685d8896bcb6185fb9ee6dbdbe8 SHA512 437a8085a58a0715953235c1e23b2903f4585fabeb29da76d5743b4c52e95b6b32455b9cf0c92e67db4d94122349688d17a0ca9229bcc0189eb87751c39a4293 WHIRLPOOL 2d44e36f6c76f73eeea3147430c58d70ccee83bbdfc24d77ac538ef83139bcb60026aad9843a23754bfedc54285d3626984b161e947d77d3df2c54d9a5e4b2c6
+DIST sec-2.7.5.tar.gz 120333 SHA256 a21dcbb61aa99930f911b79e9412b875af12b08722a78295d210b896f23a0301 SHA512 fdbf62c7f14d0e793d33bdaadc503feb13867763b8699fbab20288d7ff9136925ffbf7890a961c24488a4a036aca9f0a13c55cca814ca23f7fb4092291a2196f WHIRLPOOL 484f55397e92c365ffd1154d3d996471b2da3eaa5aa1045dfef7132bef5681b20bbbde6768bb01c0234130cbf7561dc931a4f3b7795fa09adf5aff6793b0feb4
diff --git a/net-analyzer/sec/sec-2.6.2.ebuild b/net-analyzer/sec/sec-2.7.5.ebuild
similarity index 67%
rename from net-analyzer/sec/sec-2.6.2.ebuild
rename to net-analyzer/sec/sec-2.7.5.ebuild
index 0fdc63aab104..9ac9695788db 100644
--- a/net-analyzer/sec/sec-2.6.2.ebuild
+++ b/net-analyzer/sec/sec-2.7.5.ebuild
@@ -1,8 +1,8 @@
-# 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/net-analyzer/sec/sec-2.6.2.ebuild,v 1.3 2012/10/09 18:55:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sec/sec-2.7.5.ebuild,v 1.1 2014/05/04 13:56:06 jer Exp $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Simple Event Correlator"
 HOMEPAGE="http://simple-evcorr.sourceforge.net/"
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/simple-evcorr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
 IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.6.0"
+RDEPEND=">=dev-lang/perl-5.8.0"
 
 src_install() {
 	dobin sec
diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
index 1d2001ffe2e1..182fc2542cf3 100644
--- a/net-analyzer/sflowtool/Manifest
+++ b/net-analyzer/sflowtool/Manifest
@@ -2,3 +2,4 @@ DIST sflowtool-3.27.tar.gz 166146 SHA256 18918087b267348846ebf985e6cc25e5460c291
 DIST sflowtool-3.28.tar.gz 166990 SHA256 ef8b37244965a241098ae6c1927ae15a28c06532fd6fc33937d6e634314a4103 SHA512 ba05ef9f67b39b70b69c4d1448c6bd71dae77e1f1c39b84e2ed3ad98ca95b40874fff3d045218d0926a101666f0381e4df7fe42719e4f9fc31c1e93da6b05a6c WHIRLPOOL caa2d42f2593b4d196486544d1b6215dcea9016836df8bffaa7007a8d595b5291e6c34ed5d32fd0510070465e97c81a5278697b6f41f7a202044e21e344a0167
 DIST sflowtool-3.29.tar.gz 168454 SHA256 5ee94480f072e33005a2853d8b3a0342a5fe663fcc79e11f1c5128230d2b734b SHA512 e59b7dccd3b60268976adfef71ffd279fb97af517cb037ab3594e8fb63d07af8cdd1417ccf8e3d9356ba613ce8537c4896568fbcd237239e51a84a0a3c27d842 WHIRLPOOL 2eb032008101e43c105d2294b2594706b0a27ac65135c132d46c506689ef3ba2b783aa5ca5210316d59befc4c9da8ce96a96ce49ec3eaa44773d3d7d5f20eeb5
 DIST sflowtool-3.30.tar.gz 169194 SHA256 38e7929889ce4f9de6bc55b61dc209b842902434a822c60bc572a3d9f6c3843c SHA512 d80bdaaebc33973366356d32f2f80f43f04fad45b954f129078981e789dc75aeef69659a6ab4006dacc2b2d9ff9d416c19d14a630c3e743a40248586cf8f6a64 WHIRLPOOL 309545da978da443b02be51458ddc4a9b5760cfe0de23715c795f149a20e0ce223313216559b2ef6d4df82e8459832325d805480471435fde255cc7b487e5eb2
+DIST sflowtool-3.31.tar.gz 171025 SHA256 8d4bd98f4c280908eff471742dace7e57c5652d0b9a65050966056c5f55ec1cd SHA512 3b125a309b699ee0f9e982841d39d7f4608b60f50dd03b65529970bfc55af0c2946e3639b5fe865fc7121d7dd9e53e249551baca5a784e228192f96400d43f4b WHIRLPOOL f77da1c32ed330a1cce9785c10e828ad3b728da30fcc9d9a07e91f5e435d5a2842f208665235cd42a74377aa5171f979d958e027184e0f089862d254ef17fb1f
diff --git a/net-analyzer/sflowtool/sflowtool-3.31.ebuild b/net-analyzer/sflowtool/sflowtool-3.31.ebuild
new file mode 100644
index 000000000000..2cf1e14b3d48
--- /dev/null
+++ b/net-analyzer/sflowtool/sflowtool-3.31.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/net-analyzer/sflowtool/sflowtool-3.31.ebuild,v 1.1 2014/05/04 14:16:58 jer Exp $
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
+HOMEPAGE="http://www.inmon.com/technology/sflowTools.php"
+SRC_URI="http://www.inmon.com/bin/${P}.tar.gz"
+
+LICENSE="inmon-sflow"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+src_prepare() {
+	append-cppflags -DSPOOFSOURCE
+	use debug && append-cppflags -DDEBUG
+}
diff --git a/net-analyzer/tsung/Manifest b/net-analyzer/tsung/Manifest
index f7490ac0f4da..2faea641891f 100644
--- a/net-analyzer/tsung/Manifest
+++ b/net-analyzer/tsung/Manifest
@@ -1,3 +1,4 @@
 DIST tsung-1.3.3.tar.gz 801479 SHA256 c4a6bb38ce7f14de87bf9bd903d46c8535d120966c602f718bbbbb0b072eb0b3
 DIST tsung-1.4.2.tar.gz 798017 SHA256 66608f551a8381dd853ead64c0e44255e64f25db05d3458a2e9c557d72a34d6e SHA512 7d0f0ae8bf0175dba62dc27e4af7f03aafb6be261fead352c1c24e309bfdceb874602c4646b0e4bbd58ce25f4e19e99ce976b3d01df0919e541d361656282b26 WHIRLPOOL bd8f195572f7dbced05ba2801ccf1d7f3fd1ceb0efb09fafba413ee1ec83cddd8a5fb920ffce7ca21bbf8327284c2a3f6df82c552305a3972d71317f868b565d
 DIST tsung-1.5.0.tar.gz 925026 SHA256 9af5c1cc5bc064f85c11cbfdff42f4a36fdea53c51a30354d75f553c8c6ee83f SHA512 72e7941818aad10da81e1b9d7ecab3c1304ffd8ed085a3810d93a73ed152e95c7d8e54abe756e878078bb2a9ec5826ba52d1ea50c720ca78c52b23d7ccf6284f WHIRLPOOL 7e35d3ffca5b76479254c6865fcad3b294c519ac8bc8a51cd75958fe1ebcabd32fa4a9990bf16e9d7bec1772e0129d26195cf054b27a68d3a9f5c0fb1331d77e
+DIST tsung-1.5.1.tar.gz 1422049 SHA256 551457ffe89d1c5b7d064b13fe82e6bff00523ccc7a00367b0ae38cad0c2282b SHA512 e6efe3b1b44d0511febe189e63087a484e16f7c1f77f3e3fc3f84154061f9d7020e5b93bac32a45ae9a519a0e34ba50e0d155d3199996c95876f060caa410db6 WHIRLPOOL b1e35c23993b68053b74f1b38ea2ecc20c5c5c4f514a7e4daacc85fd8a61586ddb407d9c12b6d5d4016907eb9d145b670db7aef9b51ca7e870e0f26122dbbe24
diff --git a/net-analyzer/tsung/tsung-1.5.1.ebuild b/net-analyzer/tsung/tsung-1.5.1.ebuild
new file mode 100644
index 000000000000..39eb9689c90a
--- /dev/null
+++ b/net-analyzer/tsung/tsung-1.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tsung/tsung-1.5.1.ebuild,v 1.1 2014/05/03 04:57:37 patrick Exp $
+
+EAPI="3"
+
+# Seems to be misconfigured
+RESTRICT="test"
+
+inherit eutils
+
+DESCRIPTION="Erlang's multi-protocol distributed load testing tool"
+HOMEPAGE="http://tsung.erlang-projects.org/"
+SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/erlang"
+RDEPEND=${DEPEND}
+
+src_configure() {
+	./configure --prefix="/usr" || die "econf failed"
+}
+
+src_compile() {
+	emake || die "Failed building"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "Failed installing"
+}
diff --git a/net-analyzer/yersinia/yersinia-0.7.3.ebuild b/net-analyzer/yersinia/yersinia-0.7.3.ebuild
index 49ddb41225ac..fe5fa72f8fb5 100644
--- a/net-analyzer/yersinia/yersinia-0.7.3.ebuild
+++ b/net-analyzer/yersinia/yersinia-0.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/net-analyzer/yersinia/yersinia-0.7.3.ebuild,v 1.3 2014/04/30 10:20:36 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/yersinia/yersinia-0.7.3.ebuild,v 1.4 2014/05/04 08:26:43 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.yersinia.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk ncurses"
 
 RDEPEND="
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 255f82ab2dbb..a9537e778899 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,2 +1,4 @@
 DIST freeradius-2.2.0-patches-4.tar.xz 3140 SHA256 9fd7b6f7e1501d63a073e6279b20eb6d8154e7898d81c85a5c548543ab33c1af SHA512 38ebd65d9ad8ce8f513f2f5c7fd9ff43b81cf468038a49f9eb7f4a54d13783e88866c3031e7abc0fc8b65d2aec4f347efa358b9e7e2aadb2d15567ce7e125d1d WHIRLPOOL a532444f6bfebe260a6b4bf43157fa1624ce9920a86635172ac94e0f757263904bac6ca6a472e12df73e32a8d25d6f7b094272bd743d13c566f23bfcbff6df27
 DIST freeradius-server-2.2.0.tar.gz 4289865 SHA256 ac22eefe7bd7c1c2b4de28613e628fd3e9ccae08a00a103e5f75aac0927bf009 SHA512 8652d27a292c3a8627c13b0bf12b829d3f2c50d82ed85eb342d1ec5c84ceabf8963907d50464a5907d2934f1b069a491411b1d5129efaaecefe4a30251b2b607 WHIRLPOOL 9f7dc926da7a33bfb425cb668bc9cf940a7a2dafa2a73ba8847a15f0d725476fdb4afc41963426ade9175709007f6f72892c3e9cd33d82c6601f57b873f92471
+DIST freeradius-server-2.2.5.tar.gz 4415950 SHA256 8c4c2a0b600a8d85d2235589a5e80d4fefd1f52317e9daf8193731566fa9d012 SHA512 511599b4f4f5906441d0cda61946341f2226b9aae69b6f68b03a19898b6385499a8221933c191232d50f736cab93f0f6f271e4defe4552e7738cb21e2415f053 WHIRLPOOL 629ac42749b736a7cd606c97fb149ea6f3b11d0e77bc5fc69785e4c7956f073131eb16420f276de5664e977a37a6784d0bbff08a15c1c23389f5369320a4cb12
+DIST freeradius-server-3.0.2.tar.gz 4233972 SHA256 687f6ca9870709bd433c044947225e365f5099499abba51419bf77134223713b SHA512 8d1168081929cd296e79a31fb3940535643c69c2f2012197e7730bf0886893bfdd49fce9b8c9495ecf6709f67a42b0bfe70c47bfda2e1519aa6baabc30dbfe30 WHIRLPOOL 7e8b326051356e9878db8e5599f5c7806e9c62d9c572ea9f3d07e1a6f359caf96d9d229f05b9b847f4fbb2a51567b30f5e1fe612eff9eaab966042d7fb372b00
diff --git a/net-dialup/freeradius/files/freeradius-2.2.5-gentoo.patch b/net-dialup/freeradius/files/freeradius-2.2.5-gentoo.patch
new file mode 100644
index 000000000000..c51597cbb929
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.2.5-gentoo.patch
@@ -0,0 +1,104 @@
+--- a/raddb/radiusd.conf.in
++++ b/raddb/radiusd.conf.in
+@@ -103,7 +103,7 @@
+ #	make
+ #	make install
+ #
+-libdir = @libdir@
++libdir = @libdir@/freeradius
+ 
+ #  pidfile: Where to place the PID of the RADIUS server.
+ #
+--- a/src/modules/Makefile
++++ b/src/modules/Makefile
+@@ -12,7 +12,7 @@
+ 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+ 
+ install:
+-	$(INSTALL) -d -m 755 $(R)$(libdir)
++	$(INSTALL) -d -m 755 $(R)$(pkglibdir)
+ 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+ 
+ clean:
+--- a/src/modules/rules.mak
++++ b/src/modules/rules.mak
+@@ -122,7 +122,7 @@
+ $(TARGET).la: $(RLM_SUBDIRS) $(LT_OBJS)
+ 	$(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \
+ 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
+-	-rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
++	-rpath $(pkglibdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
+ 
+ #######################################################################
+ #
+@@ -163,13 +163,11 @@
+ #  Do any module-specific installation.
+ #
+ #  If there isn't a TARGET defined, then don't do anything.
+-#  Otherwise, install the libraries into $(libdir)
++#  Otherwise, install the libraries into $(pkglibdir)
+ #
+ install:
+ 	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
+ 	if [ "x$(TARGET)" != "x" ]; then \
+ 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
+-		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
+-	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
+-	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
++		$(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \
+ 	fi
+--- a/src/modules/rlm_sql/drivers/rules.mak
++++ b/src/modules/rlm_sql/drivers/rules.mak
+@@ -103,7 +103,7 @@
+ $(TARGET).la: $(LT_OBJS)
+ 	$(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \
+ 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
+-	-rpath $(libdir) $^ $(RLM_SQL_LIBS)
++	-rpath $(pkglibdir) $^ $(RLM_SQL_LIBS)
+ 
+ #######################################################################
+ #
+@@ -141,12 +141,10 @@
+ #  Do any module-specific installation.
+ #
+ #  If there isn't a TARGET defined, then don't do anything.
+-#  Otherwise, install the libraries into $(libdir)
++#  Otherwise, install the libraries into $(pkglibdir)
+ #
+ install:
+ 	if [ "x$(TARGET)" != "x" ]; then \
+ 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
+-		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
+-	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
+-	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
++		$(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \
+ 	fi
+--- a/src/lib/Makefile
++++ b/src/lib/Makefile
+@@ -42,7 +42,7 @@
+ 
+ $(TARGET).la: $(LT_OBJS)
+ 	$(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION) \
+-	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
++	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LIBS)
+ 
+ $(LT_OBJS): $(INCLUDES)
+ 
+@@ -54,7 +54,5 @@
+ 	$(INSTALL) -d -m 755	$(R)$(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
+ 		$(R)$(libdir)/$(TARGET).la
+-	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
+-	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
+ 
+ reconfig:
+--- a/Make.inc.in
++++ b/Make.inc.in
+@@ -10,6 +10,7 @@
+ sysconfdir	= @sysconfdir@
+ localstatedir	= @localstatedir@
+ libdir		= @libdir@
++pkglibdir	= @libdir@/freeradius
+ bindir		= @bindir@
+ sbindir		= @sbindir@
+ docdir		= @docdir@
diff --git a/net-dialup/freeradius/files/radius.init-r3 b/net-dialup/freeradius/files/radius.init-r3
index 73a368a9505e..473c4c569042 100644
--- a/net-dialup/freeradius/files/radius.init-r3
+++ b/net-dialup/freeradius/files/radius.init-r3
@@ -1,11 +1,11 @@
 #!/sbin/runscript
-# 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/net-dialup/freeradius/files/radius.init-r3,v 1.3 2012/12/28 13:08:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v 1.4 2014/05/03 15:47:45 jer Exp $
 
 command=/usr/sbin/radiusd
 command_args="${RADIUSD_OPTS}"
-pidfile="${pidfile:-/var/run/radiusd/radiusd.pid}"
+pidfile="${pidfile:-/run/radiusd/radiusd.pid}"
 extra_started_commands="reload"
 
 depend() {
@@ -21,6 +21,8 @@ start_pre() {
 
 	checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
 		$(dirname ${pidfile}) /var/log/radius
+	checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
+		$(dirname ${pidfile}) /run/radius
 }
 
 reload() {
diff --git a/net-dialup/freeradius/freeradius-2.2.5.ebuild b/net-dialup/freeradius/freeradius-2.2.5.ebuild
new file mode 100644
index 000000000000..c9dc69c1b502
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-2.2.5.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.2.5.ebuild,v 1.3 2014/05/04 08:20:23 ago Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils pam python-any-r1 user
+
+PATCHSET=4
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="
+	ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${PN}-2.2.0-patches-${PATCHSET}.tar.xz
+
+"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	bindist debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap
+	postgres python readline sqlite ssl
+"
+
+RDEPEND="!net-dialup/cistronradius
+	!net-dialup/gnuradius
+	sys-devel/libtool
+	dev-lang/perl
+	sys-libs/gdbm
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline )
+	pcap? ( net-libs/libpcap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	firebird? ( dev-db/firebird )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	oracle? ( dev-db/oracle-instantclient-basic )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="bindist? ( !firebird )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup radius
+	enewuser radius -1 -1 /var/log/radius radius
+
+	python-any-r1_pkg_setup
+	export PYTHONBIN="${EPYTHON}"
+}
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/patches/0002*patch \
+		"${WORKDIR}"/patches/0004*patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	use ssl || rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap}
+	use ldap || rm -r src/modules/rlm_ldap
+	use kerberos || rm -r src/modules/rlm_krb5
+	use pam || rm -r src/modules/rlm_pam
+	use python || rm -r src/modules/rlm_python
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory # requires some membership.h
+	rm -r src/modules/rlm_redis{,who} # requires redis
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds,sybase}
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+
+	# remove bundled ltdl to avoid conflicts
+	rm -r libltdl
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myconf="${myconf} --enable-heimdal-krb5"
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	econf \
+		--enable-shared --disable-static \
+		--disable-ltdl-install \
+		--with-system-libtool \
+		--with-system-libltdl \
+		--with-ascend-binary \
+		--with-udpfromto \
+		--with-dhcp \
+		--with-iodbc-include-dir=/usr/include/iodbc \
+		--with-experimental-modules \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-logdir=/var/log/radius \
+		$(use_enable debug developer) \
+		$(use_with ldap edir) \
+		$(use_with ssl openssl) \
+		${myconf}
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	emake R="${D}" install
+
+	fowners -R root:radius /etc/raddb
+
+	sed -i \
+		-e 's:/var/run/radiusd:/run/radiusd:' \
+		"${D}"/etc/raddb/radiusd.conf || die
+
+	pamd_mimic_system radiusd auth account password session
+
+	dodoc CREDITS
+
+	rm "${D}/usr/sbin/rc.radiusd"
+
+	newinitd "${FILESDIR}/radius.init-r3" radiusd
+	newconfd "${FILESDIR}/radius.conf-r3" radiusd
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs
+		./bootstrap
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/freeradius/freeradius-3.0.2.ebuild b/net-dialup/freeradius/freeradius-3.0.2.ebuild
new file mode 100644
index 000000000000..d56c4557df51
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-3.0.2.ebuild,v 1.3 2014/05/03 21:30:30 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils pam python-any-r1 user
+
+PATCHSET=4
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="
+	ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS=""
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	bindist debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap
+	postgres python readline sqlite ssl
+"
+
+REQUIRED_USE="bindist? ( !firebird )"
+
+RDEPEND="!net-dialup/cistronradius
+	!net-dialup/gnuradius
+	sys-devel/libtool
+	dev-lang/perl
+	sys-libs/gdbm
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline )
+	pcap? ( net-libs/libpcap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	firebird? ( dev-db/firebird )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	oracle? ( dev-db/oracle-instantclient-basic )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup radius
+	enewuser radius -1 -1 /var/log/radius radius
+
+	python-any-r1_pkg_setup
+	export PYTHONBIN="${EPYTHON}"
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	use ssl || rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap}
+	use ldap || rm -r src/modules/rlm_ldap
+	use kerberos || rm -r src/modules/rlm_krb5
+	use pam || rm -r src/modules/rlm_pam
+	use python || rm -r src/modules/rlm_python
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory # requires some membership.h
+	rm -r src/modules/rlm_redis{,who} # requires redis
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds}
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:/var/run/radiusd:/run/radiusd:' \
+		raddb/radiusd.conf || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myconf="${myconf} --enable-heimdal-krb5"
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	econf \
+		--enable-shared \
+		--disable-static \
+		--disable-ltdl-install \
+		--with-system-libtool \
+		--with-system-libltdl \
+		--with-ascend-binary \
+		--with-udpfromto \
+		--with-dhcp \
+		--with-iodbc-include-dir=/usr/include/iodbc \
+		--with-experimental-modules \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-logdir=/var/log/radius \
+		$(use_enable debug developer) \
+		$(use_with ldap edir) \
+		$(use_with ssl openssl) \
+		${myconf}
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	emake -j1 Q='' LOCAL_CERT_PRODUCTS='' R="${D}" install
+
+	fowners -R root:radius /etc/raddb
+
+	pamd_mimic_system radiusd auth account password session
+
+	dodoc CREDITS
+
+	rm "${D}/usr/sbin/rc.radiusd"
+
+	newinitd "${FILESDIR}/radius.init-r3" radiusd
+	newconfd "${FILESDIR}/radius.conf-r3" radiusd
+
+	prune_libtool_files
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs
+		./bootstrap
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild
index 2e3639fe1bfe..0e5a5b346a59 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild,v 1.2 2014/04/30 10:35:31 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild,v 1.3 2014/05/04 08:26:59 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/xelerance/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dnsretry +kernel"
 
 DEPEND="net-libs/libpcap"
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
index b287960d2a3d..d1104c13d283 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-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-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild,v 1.1 2014/04/05 08:23:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild,v 1.3 2014/05/03 20:34:27 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://members.home.nl/p.a.rombouts/pdnsd/releases/${P}-par.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ~s390 sparc x86"
 IUSE="debug ipv6 isdn +urandom test"
 
 RDEPEND="sys-apps/openrc"
diff --git a/net-im/openfire/openfire-3.9.2-r1.ebuild b/net-im/openfire/openfire-3.9.2-r1.ebuild
index bbfbe3f58b2d..e76672b845fc 100644
--- a/net-im/openfire/openfire-3.9.2-r1.ebuild
+++ b/net-im/openfire/openfire-3.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/net-im/openfire/openfire-3.9.2-r1.ebuild,v 1.1 2014/05/01 08:08:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.9.2-r1.ebuild,v 1.2 2014/05/04 08:20:33 ago Exp $
 
 inherit eutils java-pkg-2 java-ant-2 systemd
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/net-irc/loqui/loqui-0.5.4.ebuild b/net-irc/loqui/loqui-0.5.4.ebuild
index 10b24c775d4b..3f387b35be07 100644
--- a/net-irc/loqui/loqui-0.5.4.ebuild
+++ b/net-irc/loqui/loqui-0.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/net-irc/loqui/loqui-0.5.4.ebuild,v 1.2 2014/04/30 10:52:50 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/loqui-0.5.4.ebuild,v 1.3 2014/05/04 08:27:14 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/loqui/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.22:2
diff --git a/net-irc/quassel/quassel-0.10.0.ebuild b/net-irc/quassel/quassel-0.10.0.ebuild
deleted file mode 100644
index 8d423cf03c0b..000000000000
--- a/net-irc/quassel/quassel-0.10.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0.ebuild,v 1.1 2014/04/01 23:08:36 johu Exp $
-
-EAPI=5
-
-inherit cmake-utils eutils pax-utils user versionator
-
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
-[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X"
-
-SERVER_RDEPEND="
-	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
-	)
-	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	postgres? ( dev-qt/qtsql:4[postgres] )
-	syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
-	dev-qt/qtgui:4
-	ayatana? ( dev-libs/libindicate-qt )
-	dbus? (
-		dev-qt/qtdbus:4
-		dev-libs/libdbusmenu-qt
-	)
-	kde? (
-		kde-base/kdelibs:4
-		kde-base/oxygen-icons:4
-		ayatana? ( kde-misc/plasma-widget-message-indicator )
-	)
-	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
-	webkit? ( dev-qt/qtwebkit:4 )
-"
-
-RDEPEND="
-	dev-qt/qtcore:4[ssl?]
-	monolithic? (
-		${SERVER_RDEPEND}
-		${GUI_RDEPEND}
-	)
-	!monolithic? (
-		server? ( ${SERVER_RDEPEND} )
-		X? ( ${GUI_RDEPEND} )
-	)
-	"
-DEPEND="${RDEPEND}
-	kde? ( dev-util/automoc )"
-
-DOCS="AUTHORS ChangeLog README"
-
-S="${WORKDIR}/${P/_/-}"
-
-REQUIRED_USE="
-	|| ( X server monolithic )
-	crypt? ( || ( server monolithic ) )
-	postgres? ( || ( server monolithic ) )
-	syslog? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) )
-	phonon? ( || ( X monolithic ) )
-	dbus? ( || ( X monolithic ) )
-	ayatana? ( || ( X monolithic ) )
-	webkit? ( || ( X monolithic ) )
-"
-
-pkg_setup() {
-	if use server; then
-		QUASSEL_DIR=/var/lib/${PN}
-		QUASSEL_USER=${PN}
-		# create quassel:quassel user
-		enewgroup "${QUASSEL_USER}"
-		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with ayatana LIBINDICATE)
-		$(cmake-utils_use_want X QTCLIENT)
-		$(cmake-utils_use_want server CORE)
-		$(cmake-utils_use_want monolithic MONO)
-		$(cmake-utils_use_with webkit)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with kde)
-		$(cmake-utils_use_with dbus)
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with syslog)
-		$(cmake-utils_use_with !kde OXYGEN)
-		$(cmake-utils_use_with crypt)
-		"-DEMBED_DATA=OFF"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		# needs PAX marking wrt bug#346255
-		pax-mark m "${ED}/usr/bin/quasselcore"
-
-		# prepare folders in /var/
-		keepdir "${QUASSEL_DIR}"
-		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
-		# init scripts
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
-
-		# logrotate
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel
-	fi
-}
-
-pkg_postinst() {
-	if use monolithic && use ssl ; then
-		elog "Information on how to enable SSL support for client/core connections"
-		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
-	fi
-
-	if use server; then
-		einfo "If you want to generate SSL certificate remember to run:"
-		einfo "	emerge --config =${CATEGORY}/${PF}"
-	fi
-
-	if use server || use monolithic ; then
-		einfo "Quassel can use net-misc/oidentd package if installed on your system."
-		einfo "Consider installing it if you want to run quassel within identd daemon."
-	fi
-
-	# temporary info mesage
-	if use server && [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; then
-		echo
-		ewarn "Please note that all configuration moved from"
-		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
-		ewarn "to: ${QUASSEL_DIR}."
-		echo
-		ewarn "For migration, stop the core, move quasselcore files (pretty much"
-		ewarn "everything apart from quasselclient.conf and settings.qss) into"
-		ewarn "new location and then start server again."
-	fi
-}
-
-pkg_config() {
-	if use server && use ssl; then
-		# generate the pem file only when it does not already exist
-		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
-			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
-			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
-				-out "${QUASSEL_DIR}/quasselCert.pem"
-			# permissions for the key
-			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
-			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
-		else
-			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
-			einfo "Remove it if you want to create new one."
-		fi
-	fi
-}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 4d3b7d33b406..08b07c73171c 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.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/net-irc/quassel/quassel-9999.ebuild,v 1.70 2014/04/01 23:08:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.71 2014/05/03 18:39:28 johu Exp $
 
 EAPI=5
 
-inherit cmake-utils eutils pax-utils user versionator
+inherit cmake-utils eutils pax-utils systemd user versionator
 
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
 [[ "${PV}" == "9999" ]] && inherit git-r3
@@ -116,9 +116,10 @@ src_install() {
 		keepdir "${QUASSEL_DIR}"
 		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
 
-		# init scripts
+		# init scripts & systemd unit
 		newinitd "${FILESDIR}"/quasselcore.init quasselcore
 		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
 
 		# logrotate
 		insinto /etc/logrotate.d
diff --git a/net-irc/sic/sic-1.2.ebuild b/net-irc/sic/sic-1.2.ebuild
index e693b8ca561c..8d2ff7cb59f8 100644
--- a/net-irc/sic/sic-1.2.ebuild
+++ b/net-irc/sic/sic-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/net-irc/sic/sic-1.2.ebuild,v 1.2 2014/04/30 11:03:37 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/sic/sic-1.2.ebuild,v 1.3 2014/05/04 08:27:28 ago Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild
index 39d0ecea03d1..1d2516743b6c 100644
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild,v 1.2 2014/05/02 08:43:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild,v 1.4 2014/05/04 12:11:45 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -13,7 +13,7 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.4.ebuild
index 13434fa1c4da..29ca47d25afb 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.4.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.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/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.4.ebuild,v 1.1 2014/04/12 12:52:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.4.ebuild,v 1.3 2014/05/04 12:11:50 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 LICENSE="LGPL-2+"
 SLOT="0/1"
 IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # pango used in goaeditablelabel
 # libsoup used in goaoauthprovider
diff --git a/net-libs/libmbim/libmbim-1.6.0.ebuild b/net-libs/libmbim/libmbim-1.6.0.ebuild
index ac335fcddd01..1391effe3629 100644
--- a/net-libs/libmbim/libmbim-1.6.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmbim/libmbim-1.6.0.ebuild,v 1.1 2014/01/20 05:06:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmbim/libmbim-1.6.0.ebuild,v 1.3 2014/05/04 12:13:33 pacho Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 4fffb1d0ce04..f5c0b2c0ab85 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,3 +1,4 @@
 DIST libmicrohttpd-0.9.32.tar.gz 1124859 SHA256 e554b8e1313b336616a460aca0ac1fc8c96552320bc1d4dc503ce00bfb70d89c SHA512 66ed77782e880378e476348b85554f7b70324d4dc51b8fa2fadd1c3f46ae3467b1acb3a1fe23804b65a5db5aa79e5b748e46a7486cf70bf14b74ffe77abd0f71 WHIRLPOOL 4be16f9cdf3dce663586a38ac6cd8bba23dfb744c553e6de2742b5153a52443139dd05ed07117062bde8a8235823fa7ebcb860c95dbdd3dd14c6165f01d2e39b
 DIST libmicrohttpd-0.9.33.tar.gz 1104292 SHA256 d9587e8497548f820650cd607daf3615ea3272435779378983032c570f1cd559 SHA512 4ca8dc37b59e5b3df2426b763420d88ae7691c57bace4bdb6bb766a135904c895892236a21da45bb636b8fcf0835fa101ce82484dec272e850b7627719c6e0f8 WHIRLPOOL 8ca8593f25637b0db7c837fbc8f7d9abc5aa3e935501b7bc886f0152d7acdeac5f49c8130d77c1bbdb68e019a3927c6cc0345ba46364d8ee33bb70dfa6d812df
 DIST libmicrohttpd-0.9.34.tar.gz 1141536 SHA256 29a2bfd4fd2ddf60c756b8c283291a134898e3cc143843be421a040be1b25a88 SHA512 ca4403adb89251abefc85cfd5dafa2a391db1cdff529b7056ca6429cc6f1ba99f510a9fbc34dbbb2c99ef006fe4be56ea6aa97c0a3a2ec94af03a2b6c3a7419f WHIRLPOOL 593ae1228c437163670e506e26de1321448bfb4d772dd7f0bd1a0ca999fa158ae34434bb7865e22e24173f3078a5e9ad463b1ba1289f33493fecf0f356522b11
+DIST libmicrohttpd-0.9.35.tar.gz 1167844 SHA256 bc5df1595a9119e9005dc69e6417d0165c04db1ad16754063a2adfd3293510fc SHA512 17d87eea02d68d8636cc252082684d64036521b9f47ae7fa82126037d3b4807c58947e80086a6a162d0e4baca9089023e39075b9688b684f5f146bf552e1f358 WHIRLPOOL cdb5b9091839bb8785a2d3debfecdbffb81da28e4e57ddf41080f29c0154c58f9ede4263ad51eb7244387eb32b80531132b9a329012893a6c7496814eefcdbbe
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild
index bd2b3e7443c4..49d91f6c3a6a 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild
@@ -1,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/libmicrohttpd/libmicrohttpd-0.9.34.ebuild,v 1.3 2014/03/27 14:54:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild,v 1.4 2014/05/03 13:10:55 blueness Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 IUSE="epoll messages ssl static-libs test"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.35.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.35.ebuild
new file mode 100644
index 000000000000..c84fd5b72d40
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.35.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/libmicrohttpd-0.9.35.ebuild,v 1.1 2014/05/03 12:18:01 blueness Exp $
+
+EAPI="5"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application."
+HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+IUSE="epoll messages ssl static-libs test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+RDEPEND="ssl? (
+		dev-libs/libgcrypt:0
+		net-libs/gnutls
+	)"
+
+DEPEND="${RDEPEND}
+	test?	(
+		ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+	econf \
+		--enable-bauth \
+		--enable-dauth \
+		--disable-spdy \
+		$(use_enable epoll) \
+		$(use_enable test curl) \
+		$(use_enable messages) \
+		$(use_enable messages postprocessor) \
+		$(use_enable ssl https) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 9627f489969c..f04b9bff1fd9 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1 +1,2 @@
 DIST rabbitmq-c-v0.3.0.zip 156945 SHA256 77554c6d83c72af5248ad0179edd6fa227545d611159f3ad18e2ade5eb07a1b6 SHA512 8b05bb5847caae6e383de0aff0b5544cc44722da4af86b0c4670780e04de4cf8ee681ab848e44c16b082b8ea2025cec841b41703b0fe34747a81f53042f61050 WHIRLPOOL 3bd908f9fe454dcae6d5aa17c36a4d427cb5192a2bd31afc14b9fa1ae5b32f98b924a10dfc4958d09a7b1b98935e52039e0d0c46a5ae0f865f1903cb131c84bb
+DIST rabbitmq-c-v0.5.0.zip 234929 SHA256 91e883c5cc3c72c5cb351c598b39e2e531c891b5a3e6ad1f82ee261caa5a3e6c SHA512 7b30ecc4831f0145db68a1811b5cb7e4eb55a6b826efa0834a705c03f2ecba3d6d2b8187cdf1472e7da2af8dc77b67674916ec31fa6086e00a01304a097b4430 WHIRLPOOL acf08d02c0ddcc9f651aae2e5cef5f37f0748179cbd015d7c550405e2efb380c5d921faec49cb5eebdd442985aa73236cc9861b74925e8c3370a589dba7af602
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild
new file mode 100644
index 000000000000..a10e839c2f57
--- /dev/null
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild,v 1.1 2014/05/04 13:55:55 ultrabug Exp $
+
+EAPI="5"
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="RabbitMQ C client"
+HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/alanxz/rabbitmq-c.git"
+	KEYWORDS="-*"
+else
+	SRC_URI="https://github.com/alanxz/rabbitmq-c/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="tools"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( "AUTHORS" "README.md" "THANKS" "TODO" )
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use tools BUILD_TOOLS)
+		$(cmake-utils_use tools BUILD_TOOLS_DOCS)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild
index 372ee239c6c3..8a4116432e73 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.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/telepathy-glib/telepathy-glib-0.24.0.ebuild,v 1.2 2014/04/19 11:28:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild,v 1.4 2014/05/04 12:11:56 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -15,7 +15,7 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 258a7609a037..366842c7c5d0 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1 +1,2 @@
 DIST geoipupdate-2.0.0.tar.gz 569114 SHA256 b80e20aa9046bd63653d9a28c3bd9591261d59a6437a17673d5700c5924ef832 SHA512 a40dfcdece0a93d4c7719e1b8c7e51ba5c82c815116466359c28315d398a416a2ff71a5d4c636445cdb156dee638cf5bb13c61579d62a86d9ccfff647bb02f87 WHIRLPOOL 4e19ec77e9a102f8ed05be6513450700f99de8f6375d1575c9e78789ffc30c791b538fe1548c0a676198a4d46adc56ba796e1fb8d8fed5b41e83ec88c90befce
+DIST geoipupdate-2.0.1.tar.gz 333358 SHA256 53cc9e69edbad41552ca6838649cf4a211b201bc2410eeab9a9d5fe5bf39e404 SHA512 a64f0180073ff8655e1777c93646baa3c8c11445b34120441a05b0e01508047b97f50a6c10886cd6f9bf8086493586234e58ad8b1200399e0b4a76c038c74eea WHIRLPOOL 99ea15cecf3bb2874ddcdf3e90538afe089bfdf098e8d5af6ea83de8c0ef7379a4eff1bd380e9719ef500c09ce8477895046ee5fb8a9f252e9a49fbe759fbbdd
diff --git a/net-misc/geoipupdate/geoipupdate-2.0.1.ebuild b/net-misc/geoipupdate/geoipupdate-2.0.1.ebuild
new file mode 100644
index 000000000000..39ca17e36a99
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-2.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/geoipupdate/geoipupdate-2.0.1.ebuild,v 1.1 2014/05/03 20:19:16 jer Exp $
+
+EAPI=5
+
+DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="
+	net-misc/curl
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	!<dev-libs/geoip-1.6.0
+"
diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
index c8b1a7ce2442..47716882af8a 100644
--- a/net-misc/guacamole-server/Manifest
+++ b/net-misc/guacamole-server/Manifest
@@ -1 +1,2 @@
 DIST guacamole-server-0.8.3.tar.gz 515611 SHA256 e958291ca967ce05d9e5e55d884b25725330fff6c067cbde4bbb7b039fb8db09 SHA512 c61428e83104fce004d99c83b31a195ef5dd01d601f5e5e15ab03530401fb9e23a8a6927b39a8854b14da7ab90407d9f56190ffc7649ff52501c59055d9a145a WHIRLPOOL 78ce02e7ad87120ca31be56a98fbeca71ab5b0725b7a456b70a5f8cef8d1d98b4b7fbcdc4bba4dd1f43da897118e3532ea5d1f4458864ef7ac6081942074542f
+DIST guacamole-server-0.9.0.tar.gz 556465 SHA256 289cb1ea0261396e9ede6aa0d2ac8d80b9ec03a124cb0669802f7e8556e21a58 SHA512 73942eecdeb8204a32e0d6ef0b92c2b23dea0b4a0e82693c05a81539319a7ff9db9ac897822f9ca33fb1913cec25058a16c67ec10d91778a3f1cf9615add5f0a WHIRLPOOL abb9c1d3fa144ae817fd87f42a1f4bfc69e9c6c3f41bac5f76b06b46dc8087d279a061b81097c3dad3c6ed5b528d8b400d8f8b3d3a4338189d401f6dc1845799
diff --git a/net-misc/guacamole-server/guacamole-server-0.9.0.ebuild b/net-misc/guacamole-server/guacamole-server-0.9.0.ebuild
new file mode 100644
index 000000000000..fb767afd3e53
--- /dev/null
+++ b/net-misc/guacamole-server/guacamole-server-0.9.0.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/net-misc/guacamole-server/guacamole-server-0.9.0.ebuild,v 1.2 2014/05/03 13:44:03 nativemad Exp $
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole."
+
+HOMEPAGE="http://guacamole.sourceforge.net/"
+SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86"
+
+IUSE="rdesktop vnc ssh pulseaudio vorbis"
+
+DEPEND="x11-libs/cairo
+	ssh? ( x11-libs/pango
+		net-libs/libssh2 )
+	rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+	vnc? ( net-libs/libvncserver
+	pulseaudio? ( media-sound/pulseaudio ) )
+	vorbis? ( media-libs/libvorbis )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --with-init-dir=/etc/init.d
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/net-misc/livestreamer/Manifest b/net-misc/livestreamer/Manifest
index d080f0501d89..c122aa287b9f 100644
--- a/net-misc/livestreamer/Manifest
+++ b/net-misc/livestreamer/Manifest
@@ -1,2 +1,3 @@
 DIST livestreamer-1.7.2.tar.gz 557683 SHA256 0fba4fe00736992ac31dc3a7edc3850b6d2ff8c4d67ca518db699010f1f12ece SHA512 79db7a020828790372206bf2e145b2fe99e5b94965206f44dbcf553653f88aa4163cc866631202371290eec67bf915de05a5ab348fcb6752c2362f46fc1af15e WHIRLPOOL 782abfe62062ff33a785585364b6506a9c76246d0a7551509a91f90e5bf69052b329aad7bacd4676c2adae4782b966db0481565f20668dd3c75251682621b172
 DIST livestreamer-1.7.5.tar.gz 561992 SHA256 1e7db873f6c2b21a7cba2cdb0143e5da0de1b38fde598cacd4cc66d3bbc25e5d SHA512 e1a618a49e64bcf89d8029d49601812229670ed0f7955ce5b61cc1f79b15652f4a6b97ed253b0e149c228d9552e0c314009c73011253741e06f3b45152fc980a WHIRLPOOL 713b301c0307462d38c1ae452e1723b1eaedf14ed75f8433a324bd433f2604cf8513f73f43bfe4a1802bdf647725873961955ebb87882197d4b3e8b299436f25
+DIST livestreamer-1.8.0.tar.gz 571424 SHA256 88122d4d197fa32560b53b3717edc88b87220aad7e4bda3a57387f6897fdf73b SHA512 282a0168bc71840a11104b9a77918c09697a92b9e0ab4a410493492e6a0f7a842df58d4256faa107bab83857e1a70392aef7c8cdc8161b9af61d1baa7640b2e6 WHIRLPOOL 7b4ad9f7c5354598d117f1fa8fb88ff6b22af630f4d8991d4ae15c6b7f886c4b7e9f0a2e9b9b66aefae2354aebc805240f1c175c41b06d1dbd6615fb94d511a8
diff --git a/net-misc/livestreamer/livestreamer-1.8.0.ebuild b/net-misc/livestreamer/livestreamer-1.8.0.ebuild
new file mode 100644
index 000000000000..497c5eee0edf
--- /dev/null
+++ b/net-misc/livestreamer/livestreamer-1.8.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/net-misc/livestreamer/livestreamer-1.8.0.ebuild,v 1.1 2014/05/04 10:56:53 hwoarang Exp $
+
+EAPI="5"
+
+DESCRIPTION="CLI tool that pipes video streams from services like twitch.tv into a video player"
+HOMEPAGE="https://github.com/chrippa/livestreamer"
+SRC_URI="https://github.com/chrippa/livestreamer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+PYTHON_COMPAT=( python{2_7,3_2} )
+inherit distutils-r1
+
+KEYWORDS="~amd64 ~mips ~x86"
+LICENSE="Apache-2.0 BSD-2 MIT-with-advertising"
+SLOT="0"
+
+RDEPEND="dev-python/pycrypto
+	>=dev-python/requests-1.0
+	>media-video/rtmpdump-2.4"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index 7d5327694880..1b3e3f979096 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,2 +1,3 @@
 DIST mediatomb-0.12.1.tar.gz 1240612 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd SHA512 36e7269a532a79c91b4ea7be36f92cbefa913a1f856e422e46fe2b97ee7a569dd20c38b0cbe651a8e7faacde892ea18f3cac66c3c0737480c44f9b9bc3a45438 WHIRLPOOL 6a9e294aa9f8f40850863a86bae4fd6a81d198d7f4cf34d67a6a0cd568c387ef0f0bd5a3524c7bc05cb304f4e86dd0c12dc773bd1034c1924af6919cc740177b
 DIST mediatomb_0.12.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df21c48f6b76ad716e29427948a524e5c84d90 SHA512 21f876de3ec0b24bfcb37d387b5337d574f2e62e12944547f0a2e69e34532e296097fd04cce9941e994c3823a7bb863172db4fc3024d490f2a2359b7f0adb079 WHIRLPOOL ad38bc64411f1aac25672c522b862401897f0e4225ea21bab317a1c3311ef87a3e688f6ea1abb5a30eeb4cb3165dabbbff158eb5d4267dba901a54f15017078d
+DIST mediatomb_0.12.1-5.debian.tar.gz 36001 SHA256 bfbc971eeaeb09791d4cf1b1102a19ca9ce69d67c97608bba7b8ce3b519a8625 SHA512 420cf0d4fc0aa82337f2893ef18f04f9d079d833f2540d6bee504d423e8acee5e5ae528d97f5cd4228d6648777c62d6186532f7a74d3d0cb04f9226a2de1dd95 WHIRLPOOL 3d826181f97873fc9acb67fa5a3171b9e0c60862066cc0dd29e05a4f793828fbcfb438dd1375d56144933d101824a4f498b5dbf1e269e3bb12e4ee53d9b13d59
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch
index 6bcdedb0c74f..3d357b4392aa 100644
--- a/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch
@@ -21,7 +21,7 @@ index d1998b3..358f4d1 100644
      #define DEFAULT_FFMPEGTHUMBNAILER_FILMSTRIP_OVERLAY YES
      #define DEFAULT_FFMPEGTHUMBNAILER_WORKAROUND_BUGS   NO
      #define DEFAULT_FFMPEGTHUMBNAILER_IMAGE_QUALITY     8
-+    #define DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED YES           
++    #define DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED YES
 +    #define DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR         ""
  #endif
  
@@ -88,7 +88,7 @@ index a637d9c..8e7ef23 100644
  
 +#ifdef HAVE_FFMPEGTHUMBNAILER
 +
-+static bool _mkdir(const char *path)
++static int _mkdir(const char *path)
 +{
 +    int ret = mkdir(path, 0777);
 +
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch
new file mode 100644
index 000000000000..70658c495d25
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch
@@ -0,0 +1,71 @@
+if you try to generate a bunch of thumbnails at once, it can crash:
+
+Program received signal SIGABRT, Aborted.
+[Switching to Thread 0x7fdb7a6cb700 (LWP 17295)]
+0x00007fdb8031c899 in __GI_raise (sig=sig@entry=0x6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
+56      ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
+(gdb) bt
+#0  0x00007fdb8031c899 in __GI_raise (sig=sig@entry=0x6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
+#1  0x00007fdb8031de27 in __GI_abort () at abort.c:89
+#2  0x00007fdb7f6b9222 in ff_unlock_avcodec () at /var/tmp/portage/media-video/ffmpeg-1.2.6/work/ffmpeg-1.2.6/libavcodec/utils.c:2767
+#3  0x00007fdb7f6b9662 in avcodec_open2 (avctx=0x7fdb64032080, codec=<optimized out>, options=0x0) at /var/tmp/portage/media-video/ffmpeg-1.2.6/work/ffmpeg-1.2.6/libavcodec/utils.c:1132
+#4  0x00007fdb81be57bb in ffmpegthumbnailer::MovieDecoder::initializeVideo (this=this@entry=0x7fdb7a6ca000) at libffmpegthumbnailer/moviedecoder.cpp:176
+#5  0x00007fdb81be599c in ffmpegthumbnailer::MovieDecoder::initialize (this=0x7fdb7a6ca000, filename=...) at libffmpegthumbnailer/moviedecoder.cpp:86
+#6  0x00007fdb81be92cc in ffmpegthumbnailer::VideoThumbnailer::generateThumbnail (this=this@entry=0x7fdb6402af90, videoFile=..., imageWriter=..., pAvContext=pAvContext@entry=0x0) at libffmpegthumbnailer/videothumbnailer.cpp:118
+#7  0x00007fdb81be97b4 in ffmpegthumbnailer::VideoThumbnailer::generateThumbnail (this=this@entry=0x7fdb6402af90, videoFile=..., type=<optimized out>, type@entry=Jpeg, buffer=..., pAvContext=pAvContext@entry=0x0) at libffmpegthumbnailer/videothumbnailer.cpp:191
+#8  0x00007fdb81bea23e in video_thumbnailer_generate_thumbnail_to_buffer (thumbnailer=<optimized out>, movie_filename=0x7fdb7003abc0 "........mp4", generated_image_data=0x7fdb64022680) at libffmpegthumbnailer/videothumbnailerc.cpp:113
+#9  0x00000000004ebfed in FfmpegHandler::serveContent (this=this@entry=0x7fdb64020ff0, item=..., resNum=resNum@entry=0x1, data_size=data_size@entry=0x7fdb7a6caaf0) at ../src/metadata/ffmpeg_handler.cc:475
+#10 0x00000000004e48d7 in FileRequestHandler::open (this=<optimized out>, filename=<optimized out>, info=0x7fdb7a6caaf0, mode=<optimized out>) at ../src/file_request_handler.cc:575
+#11 0x00000000004bba74 in web_open (filename=0x7fdb640175f0 "/content/media/object_id/16634/res_id/1/rh/6/ext/file.jpg", info=0x7fdb7a6caaf0, mode=UPNP_READ) at ../src/web_callbacks.cc:198
+#12 0x000000000052674b in process_request (Fp=<synthetic pointer>, RespInstr=0x7fdb7a6cab70, alias=0x7fdb7a6cab20, filename=0x7fdb7a6caad0, headers=0x7fdb7a6caab0, rtype=<synthetic pointer>, req=0x7fdb7a6cacd0) at ../upnp/src/genlib/net/http/webserver.c:1343
+#13 web_server_callback (parser=0x7fdb7a6cacd0, req=0x7fdb7a6cacd0, info=0x7fdb7a6cacc0) at ../upnp/src/genlib/net/http/webserver.c:1803
+#14 0x000000000051f29a in dispatch_request (hparser=0x7fdb7a6cacd0, info=0x7fdb7a6cacc0) at ../upnp/src/genlib/miniserver/miniserver.c:236
+#15 handle_request (args=0x7fdb6c000c40) at ../upnp/src/genlib/miniserver/miniserver.c:339
+#16 0x000000000052cc66 in WorkerThread (arg=0x7a80e0 <gRecvThreadPool>) at ../threadutil/src/ThreadPool.c:594
+#17 0x00007fdb80697333 in start_thread (arg=0x7fdb7a6cb700) at pthread_create.c:309
+#18 0x00007fdb803d226d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:111
+(gdb)
+
+--- a/src/metadata/ffmpeg_handler.cc
++++ b/src/metadata/ffmpeg_handler.cc
+@@ -311,6 +311,10 @@ void FfmpegHandler::fillMetadata(Ref<CdsItem> item)
+ 
+ #ifdef HAVE_FFMPEGTHUMBNAILER
+ 
++// The ffmpegthumbnailer code (ffmpeg?) is not threading safe.
++// Add a lock around the usage to avoid crashing randomly.
++static pthread_mutex_t thumb_lock;
++
+ static int _mkdir(const char *path)
+ {
+     int ret = mkdir(path, 0777);
+@@ -446,6 +450,9 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+             return h;
+         }
+     }
++
++    pthread_mutex_lock(&thumb_lock);
++
+ #ifdef FFMPEGTHUMBNAILER_OLD_API
+     video_thumbnailer *th = create_thumbnailer();
+     image_data *img = create_image_data();
+@@ -474,8 +481,11 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+     if (video_thumbnailer_generate_thumbnail_to_buffer(th, 
+                                          item->getLocation().c_str(), img) != 0)
+ #endif // old api
++    {
++        pthread_mutex_unlock(&thumb_lock);
+         throw _Exception(_("Could not generate thumbnail for ") + 
+                 item->getLocation());
++    }
+     if (cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED)) {
+         writeThumbnailCacheFile(item->getLocation(),
+                                 img->image_data_ptr, img->image_data_size);
+@@ -491,6 +501,7 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+     video_thumbnailer_destroy_image_data(img);
+     video_thumbnailer_destroy(th);
+ #endif// old api
++    pthread_mutex_unlock(&thumb_lock);
+     return h;
+ #else
+     return nil;
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild
new file mode 100644
index 000000000000..8e69d710ffd8
--- /dev/null
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild
@@ -0,0 +1,157 @@
+# 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 $
+
+EAPI=5
+inherit autotools eutils linux-info user
+
+DEB_VER="5"
+DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
+HOMEPAGE="http://www.mediatomb.cc/"
+
+SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm
+		libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
+REQUIRED_USE="
+	|| ( mysql sqlite )
+	taglib? ( !id3tag )
+	id3tag? ( !taglib )
+	thumbnail? ( ffmpeg !libextractor )
+	ffmpeg? ( !libextractor )
+	libextractor? ( !ffmpeg !thumbnail )
+"
+
+DEPEND="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
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	enewgroup mediatomb
+	enewuser mediatomb -1 -1 /dev/null mediatomb
+}
+
+src_prepare() {
+	# Apply Debians patchset
+	local p dd="${WORKDIR}"/debian/patches
+	sed -i -r '/^[-+]{3} /s:[.][.]/::' "${dd}"/* || die
+	# We use our version as it seems to be more complete.
+	sed -i '/^0010_fix_libmp4v2_build.patch/d' "${dd}"/series || die
+	for p in $(<"${dd}"/series) ; do
+		epatch "${dd}"/${p}
+	done
+
+	# libmp4v2 API breakage #410235
+	epatch "${FILESDIR}"/${P}-libmp4v2.patch
+
+	# Use system libuuid #270830
+	epatch "${FILESDIR}"/${P}-system-uuid.patch
+
+	# Support spidermonkey-187 #423991 #482392
+	if has_version "~dev-lang/spidermonkey-1.8.7" ; then
+		epatch "${FILESDIR}"/${P}-mozjs187.patch
+	fi
+
+	# Support libextractor-0.6.0 #435394
+	epatch "${FILESDIR}"/${P}-libextractor.patch
+
+	# Fix inotify and hard links
+	epatch "${FILESDIR}"/${P}-inotify-hard-links.patch
+
+	# Add support for caching thumbnails
+	epatch "${FILESDIR}"/${P}-thumb-cache.patch
+	epatch "${FILESDIR}"/${P}-thumbnail-locking.patch
+
+	# Respect AR #464710
+	epatch "${FILESDIR}"/${P}-system-ar.patch
+
+	# Add flac metadata support #494398
+	epatch "${FILESDIR}"/${P}-flac-metadata.patch
+
+	# Work around broken youtube support by using youtube-dl #467110
+	epatch "${FILESDIR}"/${P}-youtube-dl.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable curl) \
+		$(use_enable curl youtube) \
+		$(use_enable debug tombdebug) \
+		$(use_enable exif libexif) \
+		$(use_enable ffmpeg) \
+		$(use_enable flac FLAC) \
+		$(use_enable id3tag id3lib) \
+		$(use_enable inotify) \
+		$(use_enable javascript libjs) \
+		$(use_enable lastfm lastfmlib) \
+		$(use_enable libextractor) \
+		$(use_enable magic libmagic) \
+		$(use_enable mp4 libmp4v2) \
+		$(use_enable mysql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable taglib) \
+		$(use_enable thumbnail ffmpegthumbnailer) \
+		$(use_enable zlib) \
+		--enable-external-transcoding \
+		--enable-protocolinfo-extension
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN}
+	use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN}
+	newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN}
+
+	insinto /etc/mediatomb
+	newins "${FILESDIR}/${PN}-0.12.0.config" config.xml
+	fperms 0600 /etc/mediatomb/config.xml
+	fowners mediatomb:mediatomb /etc/mediatomb/config.xml
+
+	keepdir /var/lib/mediatomb
+	fowners mediatomb:mediatomb /var/lib/mediatomb
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "MediaTomb has been built with MySQL support and needs"
+		elog "to be configured before being started."
+		elog "For more information, please consult the MediaTomb"
+		elog "documentation: http://mediatomb.cc/pages/documentation"
+		elog
+	fi
+
+	elog "To configure MediaTomb edit:"
+	elog "/etc/mediatomb/config.xml"
+	elog
+	elog "The MediaTomb web interface can be reached at (after the service is started):"
+	elog "http://localhost:49152/"
+}
diff --git a/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild b/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild
index 355519381151..30dd8a6f3c26 100644
--- a/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.2.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/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild,v 1.1 2014/04/30 14:51:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild,v 1.3 2014/05/04 12:12:05 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection mbim policykit +qmi qmi-newest vala"
 REQUIRED_USE="
 	qmi-newest? ( qmi )
diff --git a/net-misc/netpipes/netpipes-4.2-r2.ebuild b/net-misc/netpipes/netpipes-4.2-r2.ebuild
index 0f4df0d6699c..356a208c2860 100644
--- a/net-misc/netpipes/netpipes-4.2-r2.ebuild
+++ b/net-misc/netpipes/netpipes-4.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/net-misc/netpipes/netpipes-4.2-r2.ebuild,v 1.2 2014/04/30 11:08:54 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/netpipes-4.2-r2.ebuild,v 1.3 2014/05/04 08:27:42 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://web.purplefrog.com/~thoth/netpipes/ftp/${P}-export.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${P}-export"
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild
index d24afb3f2838..bb028dca8b38 100644
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.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/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild,v 1.1 2014/03/16 15:00:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild,v 1.3 2014/05/04 12:12:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/openntpd/openntpd-20080406-r8.ebuild b/net-misc/openntpd/openntpd-20080406-r8.ebuild
index 2c54f8992efc..8164a5c311b9 100644
--- a/net-misc/openntpd/openntpd-20080406-r8.ebuild
+++ b/net-misc/openntpd/openntpd-20080406-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r8.ebuild,v 1.2 2014/04/29 20:39:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r8.ebuild,v 1.3 2014/05/03 14:14:31 maekke Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ssl selinux"
 
 RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/net-misc/rygel/rygel-0.22.1.ebuild b/net-misc/rygel/rygel-0.22.1.ebuild
index cf26fa749682..383936e6369d 100644
--- a/net-misc/rygel/rygel-0.22.1.ebuild
+++ b/net-misc/rygel/rygel-0.22.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/net-misc/rygel/rygel-0.22.1.ebuild,v 1.1 2014/04/17 08:32:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.22.1.ebuild,v 1.3 2014/05/04 12:12:15 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X nls +sqlite tracker test transcode"
 
 # The deps for tracker? and transcode? are just the earliest available
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index c7f9ec809b86..dd1d0c1c4ac5 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -12,3 +12,4 @@ DIST whois_5.0.25.tar.xz 72540 SHA256 1207bea7bcc6241554c496608a834e4b3cc1ef4bc1
 DIST whois_5.0.26.tar.xz 72508 SHA256 729625ef81425f4771e06492bb4f3e9f24bff75b8176044ce8d2f605f7ad6af5 SHA512 5a292fe721bdaea5db35437a904c0884723d037823769eccc4890cccebb3991534a2dc218b2e7abc7881cd7423dbf389fefc724899b90d28b45e45e17ca774cc WHIRLPOOL 5fa3c60237c99a616c048a25957139bc802100d242138fc41698f56842cccc203eea0040c9953ac534a27fc48db11bb230625e4fe89e51f6635a23209a96ffde
 DIST whois_5.1.0.tar.xz 73596 SHA256 f47ccaf2c4d2971a428f132416b332b5875000d0f9791626286c724316fd4e5e SHA512 079ab3070fd963401d48fec90efff1024c4c891894530794671eaf906228e1810ccb65cb48e874e2d0b3a3d55a109173fb23f90d5310495d7095f1ddc5cbe52c WHIRLPOOL f7ce0aed06dd3016ebab2a925ed6b75cd7f3befc55b21e7cd2515454ed758173b575fd535c02b77ac67a8a83fb789b160cf2f7179512bae3d347c7bf300f0f9a
 DIST whois_5.1.1.tar.xz 73832 SHA256 69fb4c3d964603967d18b931c2275e678eed5c33af0a74c41198e1b46a520644 SHA512 aea7b3ca73162737dfbc363d837538a5c4d287c4adb1407073e5d34523a04d93088166da6202b19c377f3d65891764d43d2a7ba506aa354252a7601cd91f0117 WHIRLPOOL 64834790c460df6020992518465bc453bd265a2e5d911245fef130cdfe61805fcf4289b224e01b2924ac6ebf26c46160351e7516aa1aa4c7412d9f10feefee53
+DIST whois_5.1.2.tar.xz 75696 SHA256 021f76910e772fa569e299210b36e2eeb20b56dc9ca29edb7e83a21b560a5403 SHA512 470c04b2f0a59036ba1f3fddd867508ec3d362b6088052a184d037f76f5018101ea9ca9e8775d77452b9c9c0cfd18c575f3cdc414b4afc675942f270f38a5510 WHIRLPOOL 612309cc1c3108d592d87b0a2e01613db05f0f5583f9f93d91a06c57f0bc7d94b9e0486e34c1d4451c02f4de9b25645f26eb0891547c4b5af3fdeac141e8c601
diff --git a/net-misc/whois/whois-5.1.2.ebuild b/net-misc/whois/whois-5.1.2.ebuild
new file mode 100644
index 000000000000..f5c20b21fe6e
--- /dev/null
+++ b/net-misc/whois/whois-5.1.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.1.2.ebuild,v 1.1 2014/05/03 08:33:11 radhermit Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="http://www.linux.it/~md/software/"
+SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
+
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :;} # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild
index 3f4ce9dc90bc..6452bbf727d2 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.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/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild,v 1.3 2014/04/26 10:58:01 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild,v 1.4 2014/05/04 08:23:43 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-print/cups-filters/cups-filters-1.0.53.ebuild b/net-print/cups-filters/cups-filters-1.0.53.ebuild
index 56e2731fc0b3..6a17100f1ed2 100644
--- a/net-print/cups-filters/cups-filters-1.0.53.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.53.ebuild
@@ -1,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-print/cups-filters/cups-filters-1.0.53.ebuild,v 1.4 2014/04/30 14:21:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.53.ebuild,v 1.5 2014/05/03 14:16:40 maekke Exp $
 
 EAPI=5
 
@@ -11,10 +11,10 @@ inherit base eutils perl-module autotools systemd
 if [[ "${PV}" == "9999" ]] ; then
 	inherit bzr
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS="amd64 hppa x86"
+	KEYWORDS="amd64 arm hppa x86"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups PDF filters"
 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
index 8f2fbec41eb2..33422d0a66e3 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
@@ -1,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-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild,v 1.3 2014/04/25 12:55:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild,v 1.4 2014/05/03 14:10:12 maekke Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
index 8eca1f8fbe2f..dd74dbe93ee6 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
@@ -1,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-print/foomatic-db/foomatic-db-4.0.20140105.ebuild,v 1.3 2014/04/25 12:54:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild,v 1.4 2014/05/03 14:09:35 maekke Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${PN}-$(replace_version_sepa
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.2.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.2.ebuild
index 9badda170d3e..fc469a699233 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.2.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.18.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-voip/telepathy-gabble/telepathy-gabble-0.18.2.ebuild,v 1.1 2014/03/29 18:15:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.18.2.ebuild,v 1.3 2014/05/04 12:12:21 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="gnutls +jingle plugins test"
 
 # Prevent false positives due nested configure
diff --git a/net-wireless/bluez/bluez-5.18.ebuild b/net-wireless/bluez/bluez-5.18.ebuild
index 06bcb5604f0d..ca1d7bdb1dd0 100644
--- a/net-wireless/bluez/bluez-5.18.ebuild
+++ b/net-wireless/bluez/bluez-5.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/net-wireless/bluez/bluez-5.18.ebuild,v 1.3 2014/04/27 11:49:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.18.ebuild,v 1.5 2014/05/04 12:13:02 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 arm hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86"
 IUSE="cups debug +obex +readline selinux systemd test +udev"
 REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-wireless/mdk/files/fix_wids_mdk3_v5.patch b/net-wireless/mdk/files/fix_wids_mdk3_v5.patch
new file mode 100644
index 000000000000..6013a59b9b1a
--- /dev/null
+++ b/net-wireless/mdk/files/fix_wids_mdk3_v5.patch
@@ -0,0 +1,21 @@
+diff -ur mdk3-v5-orig/mdk3.c mdk3-v5/mdk3.c
+--- mdk3-v5-orig/mdk3.c	2008-11-10 21:45:02.000000000 +0100
++++ mdk3-v5/mdk3.c	2009-01-10 01:47:03.546875000 +0100
+@@ -1092,10 +1092,13 @@
+ {
+   struct clistwidsclient *first = c;
+ 
+-  do {
+-    if (!(memcmp(c->mac, mac, mac_len))) return c;
+-    c = c->next;
+-  } while (c != first);
++  if (c != NULL)
++  {
++    do {
++      if (c->mac != NULL && !(memcmp(c->mac, mac, mac_len))) return c;
++      c = c->next;
++    } while (c != NULL && c != first);
++  }
+ 
+   return NULL;
+ }
diff --git a/net-wireless/mdk/mdk-3.6.ebuild b/net-wireless/mdk/mdk-3.6-r1.ebuild
similarity index 53%
rename from net-wireless/mdk/mdk-3.6.ebuild
rename to net-wireless/mdk/mdk-3.6-r1.ebuild
index c14144d674e7..3f1dc7389c23 100644
--- a/net-wireless/mdk/mdk-3.6.ebuild
+++ b/net-wireless/mdk/mdk-3.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/mdk/mdk-3.6.ebuild,v 1.1 2011/02/22 18:48:52 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/mdk/mdk-3.6-r1.ebuild,v 1.1 2014/05/03 17:18:41 zerochaos Exp $
 
-EAPI="3"
+EAPI="5"
 inherit eutils toolchain-funcs
 
 MY_P="${PN}${PV/./-v}"
@@ -12,26 +12,26 @@ SRC_URI="${HOMEPAGE}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-RDEPEND="net-wireless/aircrack-ng"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-makefile.patch
+	epatch "${FILESDIR}"/fix_wids_mdk3_v5.patch
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
+	emake CC=$(tc-getCC)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
+	emake DESTDIR="${ED}" install
 
 	insinto /usr/share/${PN}
-	doins -r useful_files || die
+	doins -r useful_files
 
-	dohtml docs/* || die
-	dodoc AUTHORS CHANGELOG TODO || die
+	dohtml docs/*
+	dodoc AUTHORS CHANGELOG TODO
 }
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index f29a364948a6..2ebb7e5b9b3b 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.202 2014/04/20 12:37:42 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.204 2014/05/04 12:14:32 maekke Exp $
+
+# Markus Meier <maekke@gentoo.org> (04 May 2014)
+# Unkeyworded deps, bug #507896
+dev-qt/qt-mobility messaging
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (3 May 2014)
+# Missing keywords, should only be a transitionary problem
+kde-base/baloo alternatekcm
 
 # Julian Ospald <hasufell@gentoo.org> (20 Apr 2014)
 # Missing keywords, bug #508226
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 4b4f7cec6082..d38ce41a53d8 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # 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.195 2014/04/20 12:37:42 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.196 2014/05/03 18:42:51 hwoarang Exp $
+
+# Markos Chandras <hwoarang@gentoo.org> (03 May 2014)
+# sys-libs/libseccomp suppors amd64, x86, ARM and MIPS.
+app-emulation/lxc seccomp
 
 # Julian Ospald <hasufell@gentoo.org> (20 Apr 2014)
 # Missing keywords, bug #508226
diff --git a/profiles/features/selinux/make.defaults b/profiles/features/selinux/make.defaults
index ebcfce01df00..a6172c18d8a1 100644
--- a/profiles/features/selinux/make.defaults
+++ b/profiles/features/selinux/make.defaults
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/make.defaults,v 1.1 2011/05/17 10:46:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/make.defaults,v 1.2 2014/05/03 16:26:59 swift Exp $
 #
 
-USE="-acl selinux open_perms"
+USE="-acl selinux unconfined open_perms"
 
 FEATURES="selinux sesandbox sfperms"
 
diff --git a/profiles/package.mask b/profiles/package.mask
index f40d6a7d2c3e..e9c5688f8384 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15641 2014/05/02 12:17:26 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15651 2014/05/03 18:21:57 hwoarang 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,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Markos Chandras <hwoarang@gentoo.org> (03 May 2014)
+# Masked for further testing
+>=app-emulation/lxc-1.0.0
+
+# Tom Wijsman <TomWij@gentoo.org> (03 May 2014)
+# Needs to be further tested and revised by both Java and Ruby herds. 
+>=dev-java/jruby-1.7.12
+
 # Tom Wijsman <TomWij@gentoo.org> (02 May 2014)
 # Bluetooth support in MATE has incompatibilities with recent BlueZ versions.
 # If you want to try to get this working, unmask net-wireless/mate-bluetooth as 
@@ -41,15 +49,9 @@
 # http://mate-desktop.org/blog/2014-03-11-mate-desktop-singing-the-bluez
 net-wireless/mate-bluetooth
 
-# Justin Lecher <jlec@gentoo.org> (03 Apr 2014)
-# Wrong license 465690
-# Fails to build and no fixes after years, #147574
-# removal in 30 days
-sci-geosciences/gempak
-
 # Mike Frysinger <vapier@gentoo.org> (28 Apr 2014)
 # Use app-emulation/qemu instead.  It has USE=static-user to support building
-# static user helpers.  See #508098 for more info.
+# static user helpers.  See #508098 for more info. Removal in a month
 app-emulation/qemu-user
 
 # Manuel Rüger <mrueg@gentoo.org> (28 Apr 2014)
@@ -205,10 +207,6 @@ dev-python/python-gnutls
 >=x11-themes/gnome-themes-standard-3.12.0
 >=x11-wm/mutter-3.12.1
 
-# Patrick Lauer <patrick@gentoo.org> (27 Apr 2014)
-# No longer installable with gnome-3.8 removal
-gnome-extra/evolution-kolab
-
 # Eray Aslan <eras@gentoo.org> (26 Apr 2014)
 # Non-functional and no longer needed - bug #450116
 # Removal in 30 days
@@ -434,25 +432,10 @@ www-apache/mod_chroot
 # removal in 30 days.
 dev-util/dissy
 
-# Hans de Graaff <graaff@gentoo.org> (22 Mar 2014) Dead upstream (no
-# releases since 2008, website no longer available). Can only support
-# a single ruby version. Has security issues with shared code between
-# processes. Use a rack-based alternative instead.
-# Removal in 30 days.
-www-apache/mod_ruby
-
 # Sergey Popov <pinkbyte@gentoo.org> (20 Mar 2014)
 # Security mask of vulnerable versions, wrt bug #424167
 <net-nds/openldap-2.4.35
 
-# Samuli Suominen <ssuominnen@gentoo.org> (19 Mar 2014)
-# The ebuild is appending CFLAGS -O0 to prevent segfaulting
-# on 64bit, a workaround that doesn't always work.
-# The ebuild fails to build wrt bug #500408, but it's no use
-# to fix the build if the end result is just constantly crashing.
-# Removal in 30 days, use alternative panels like x11-misc/fbpanel
-x11-misc/suxpanel
-
 # Lars Wendler <polynomial-c@gentoo.org> (14 Mar 2014)
 # Masked for security reasons.
 # Do NOT remove this mask or the affected packages without speaking to
@@ -493,10 +476,6 @@ dev-libs/clens
 <dev-lang/python-exec-0.3.1-r1:0
 <dev-lang/python-exec-2.0.1-r1:2
 
-# Michał Górny <mgorny@gentoo.org> (05 Mar 2014)
-# Seems to cause more trouble than it fixes. Bugs #503470, #503472.
-=sys-apps/systemd-208.277
-
 # Mike Gilbert <floppym@gentoo.org> (04 Mar 2014)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
@@ -549,6 +528,13 @@ lxde-base/lxpolkit
 >=sys-devel/libtool-2.4.2-r1
 >=virtual/acl-0-r2
 >=app-emulation/emul-linux-x86-baselibs-20140406-r3
+>=media-libs/ladspa-cmt-1.16-r4
+>=media-sound/lash-0.5.4-r2
+>=x11-libs/libSM-1.2.2-r1
+>=media-sound/fluidsynth-1.1.6-r1
+>=media-libs/sdl-mixer-1.2.12-r4
+>=media-libs/sdl2-mixer-2.0.0-r1
+>=app-emulation/emul-linux-x86-sdl-20140406-r2
 
 # Tom Wijsman <TomWij@gentoo.org> (21 Feb 2014)
 # MATE Desktop Environment >=1.7 introduction mask:
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index fd638af51c6d..f12b3912fd5d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -518,6 +518,7 @@ app-emulation/libvirt:virtualbox - Support management of VirtualBox virtualisati
 app-emulation/libvirt:xen - Support management of Xen virtualisation (app-emulation/xen)
 app-emulation/libvirt-glib:introspection - Use dev-libs/gobject-introspection for introspection
 app-emulation/libvirt-glib:vala - Enable bindings for dev-lang/vala
+app-emulation/lxc:seccomp - Use seccomp syscall filters using sys-libs/libseccomp
 app-emulation/lxc:vanilla - Avoid adding Gentoo Linux-specific modifications, which include the custom init script. This is present as a flag to avoid forcing dependencies over users that might not want have them around as they use LXC in contexts where the init script is not useful.
 app-emulation/open-vm-tools:doc - Generate API documentation
 app-emulation/open-vm-tools:fuse - Build vmblock-fuse in favor of FUSE based blocking mechanism for DnD
@@ -1223,6 +1224,7 @@ dev-embedded/msp430-gcc:objc-gc - Build support for the Objective C code languag
 dev-embedded/msp430-gdb:multitarget - Support all known targets in one gdb binary
 dev-embedded/msp430-gdb:python - Enable support for the new internal scripting language, as well as extended pretty printers
 dev-embedded/openocd:blaster - Enable support for Altera USE-Blaster
+dev-embedded/openocd:cmsis-dap - Support for CMSIS-DAP compliant adapters
 dev-embedded/openocd:dummy - Build the dummy port driver
 dev-embedded/openocd:ftd2xx - Enable support for USB FTDI chips via dev-embedded/libftd2xx
 dev-embedded/openocd:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
@@ -2700,6 +2702,11 @@ gnome-extra/gdesklets-core:dbus - Enable gDesklets Controls to use DBus
 gnome-extra/gnome-boxes:usbredir - Use sys-apps/usbredir to redirect USB devices to another machine over TCP
 gnome-extra/gnome-color-manager:clutter - Use media-libs/clutter to render color gamut representations
 gnome-extra/gnome-color-manager:packagekit - Enable support for the distro-neutral package manager GUI app-admin/packagekit
+gnome-extra/gnome-commander:chm - Enable metadata support for Microsoft Compiled HTML Help files
+gnome-extra/gnome-commander:gsf - Add metadata support for OLE, OLE2 and ODF
+gnome-extra/gnome-commander:pdf - Add metadata support for PDF
+gnome-extra/gnome-commander:python - Add support for python plugins"
+gnome-extra/gnome-commander:taglib - Add metadata support for ID3, Vorbis, FLAC and APE
 gnome-extra/gnome-do-plugins:banshee - Enables the Banshee (media-sound/banshee) plugin
 gnome-extra/gnome-dvb-daemon:totem - Build a plugin for media-video/totem
 gnome-extra/gnome-dvb-daemon:vala - Add support for dev-lang/vala
@@ -2772,6 +2779,7 @@ gnustep-base/gnustep-make:native-exceptions - Enables use of the native Objectiv
 gnustep-base/libobjc2:boehm-gc - Enable Hans Boehm's garbage collector (dev-libs/boehm-gc). Not recommended by upstream
 gpe-base/gpe:games - Builds and installs GPE games.
 kde-base/ark:archive - Enable support for a variety of archive formats through libarchive
+kde-base/baloo:alternatekcm - Use the alternate Systemsettings module by Lindsay Mathieson for better configurability
 kde-base/cantor:R - Enable dev-lang/R backend support
 kde-base/cantor:analitza - Enable kde-base/analitza backend support
 kde-base/cantor:qalculate - Enable sci-libs/libqalculate backend support
@@ -6883,6 +6891,7 @@ sys-process/fcron:debug - Enable debug code and output. Since version 3.0.5 this
 sys-process/fcron:mta - Enable mta support for sending emails from fcron
 sys-process/fcron:pam - Enable PAM support for fcron. This means that fcron will pass through the "fcron" stack before executing the jobs, and fcrontab will use the "fcrontab" stack to authenticate the user before editing its crontab file.
 sys-process/fcron:system-crontab - Set up fcron to respect /etc/crontab and /etc/cron.d. If this flag is disabled, /etc/cron.d and /etc/crontab will be ignored, but /etc/cron.{hourly,daily,weekly,monthly} will still be respected.
+sys-process/htop:oom - Add column to track the OOM-killer score of processes
 sys-process/htop:openvz - Enable openvz support
 sys-process/htop:vserver - Enable vserver support
 sys-process/lsof:rpc - support looking up RPC service info
@@ -7152,6 +7161,7 @@ x11-libs/cairo:gallium - Use Mesa's Gallium backend for acceleration
 x11-libs/cairo:gles2 - Use OpenGL ES 2 backend for acceleration.
 x11-libs/cairo:glib - Compile with GLib Object System support
 x11-libs/cairo:legacy-drivers - Include the buggy gradients patch (for legacy drivers, such as nvidia-drivers older than 304.30)
+x11-libs/cairo:lto - Try to build with Link-Time Optimization if supported by the compiler. This is recommended by upstream, but can cause build failure in some environments and on machines with little memory.
 x11-libs/cairo:opengl - Use Mesa backend for acceleration
 x11-libs/cairo:openvg - Use OpenVG for backend acceleration
 x11-libs/cairo:valgrind - Built-in support to mark memory regions
diff --git a/sci-calculators/galculator/galculator-2.1.3.ebuild b/sci-calculators/galculator/galculator-2.1.3.ebuild
index d972684b9890..2f314c7da853 100644
--- a/sci-calculators/galculator/galculator-2.1.3.ebuild
+++ b/sci-calculators/galculator/galculator-2.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-calculators/galculator/galculator-2.1.3.ebuild,v 1.1 2014/04/12 20:42:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-2.1.3.ebuild,v 1.3 2014/05/04 12:12:27 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG=no
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-geosciences/gempak/Manifest b/sci-geosciences/gempak/Manifest
deleted file mode 100644
index d33fc093ec55..000000000000
--- a/sci-geosciences/gempak/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gempak_upc5.7.2p2.tar.gz 118639087 SHA256 d027011e0e1bceb03a503842bcd37c792c91dadef60e8e030232bf80f57002fb
-DIST gempak_upc5.7.4.tar.gz 120491554 SHA256 ef6bcbc06b655492b55b644570db90e0b8cc89a239a7218fc64f421236aa7f6c
diff --git a/sci-geosciences/gempak/files/Makeinc.common b/sci-geosciences/gempak/files/Makeinc.common
deleted file mode 100644
index 14cbbf173b39..000000000000
--- a/sci-geosciences/gempak/files/Makeinc.common
+++ /dev/null
@@ -1,97 +0,0 @@
-###################################################################
-###################################################################
-#
-#       Makefile for GEMPAK6
-#               Unidata 11/99 Chiz - configured for UPC distribution
-#
-####################################################################
-####################################################################
-####################################################################
-#   The following shell environment variables *MUST* be defined before
-#   invoking this Makefile:
-#
-#   $NAWIPS  - points to the toplevel of the NAWIPS directory tree.
-#   $GEMPAKHOME  - points to the toplevel of the gempak part
-#              of the NAWIPS tree.  Usually directly under $NAWIPS.
-#
-#   $NA_OS   - Used in $(NAWIPS)/config/Makeinc.common to decide which
-#              OS specific Makeinc.* to include.  It also cooresponds
-#              to the directories in the NAWIPS tree where the executables
-#              and libraries are installed.
-#
-####################################################################
-GEMPAKHOME       = $(NAWIPS)/gempak
-GEMPAK		 = $(GEMPAKHOME)
-GEMTBL		 = $(GEMPAKHOME)/tables
-GEMPDF		 = $(GEMPAKHOME)/pdf
-GEMERR		 = $(GEMPAKHOME)/error
-GEMPARM		 = $(GEMPAKHOME)/parm
-GEMPTXT		 = $(GEMPAKHOME)/ptxt
-GEMHLP		 = $(GEMPAKHOME)/help
-SHELL            = /bin/sh
-FC               = f77
-CC               = cc
-AR               = ar
-ARFLAGS          = rv
-RANLIB           = ranlib
-RM               = rm -f
-INSTALL          = install -s
-AUXINSTALL       = install
-LN               = ln -s
-STRIP            = strip
-CP               = cp
-COMPILE.c        = $(CC) $(CFLAGS) -c
-COMPILE.f        = $(FC) $(FFLAGS) -c
-LINK.c           = $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS)
-LINK.f           = $(PURIFY) $(FC) $(FFLAGS) $(LDFLAGS)
-
-LDM_FLAGS        =
-
-GEMOLB           = $(NAWIPS)/lib/$(NA_OS)
-INCDIR           = $(GEMPAKHOME)/include
-GEMINC           = -I$(INCDIR)
-NAWIPS_INC       = -I$(NAWIPS)/include
-GEMEXE           = $(NAWIPS)/bin/$(NA_OS)
-SCRIPTS_EXE      = $(NAWIPS)/bin/scripts
-
-APPL             = $(GEMOLB)/appl.a
-DEVICE           = $(GEMOLB)/device.a
-GEMLIB           = $(GEMOLB)/gemlib.a
-CGEMLIB          = $(GEMOLB)/cgemlib.a
-NXMLIB           = $(GEMOLB)/Nxmlib.a
-BRIDGE           = $(GEMOLB)/bridge.a
-LDMLOG           = $(GEMOLB)/ldmlog.a
-GPLT             = $(GEMOLB)/gplt.a
-GPLT_NC          = $(GEMOLB)/ginitp_alt.o $(GEMOLB)/gendp_alt.o
-GPLTDEV          = $(GEMOLB)/gpltdev.a
-SYSLIB           = $(GEMOLB)/syslib.a
-
-GN               = $(GEMOLB)/gn.a
-XW               = $(GEMOLB)/xw.a
-GF               = $(GEMOLB)/gf.a
-GIF              = $(GEMOLB)/gif.a
-PS               = $(GEMOLB)/ps.a
-NC               = $(GEMOLB)/nc.a
-FAX              = $(GEMOLB)/fax.a
-RBK              = $(GEMOLB)/rbk.a
-TIFF             = $(GEMOLB)/tiff.a
-VG               = $(GEMOLB)/vg.a
-XWP              = $(GEMOLB)/xwp.a
-UTF              = $(GEMOLB)/utf.a
-
-X11LIB           = -lX11
-GUILIBS          = $(MOTIFLIBS) $(X11LIBDIR) -lXt -lX11
-NETCDFHOME       = $(NAWIPS)/netcdf/$(NA_OS)
-NETCDFINC        = $(NETCDFHOME)/include
-NETCDF           = $(NETCDFHOME)/lib/libnetcdf.a
-
-ZLIB             = $(GEMOLB)/libz.a
-ZLIBINC          = $(GEMPAKHOME)/source/zlib
-PNGLIB           = $(GEMOLB)/libpng.a
-PNGINC           = $(GEMPAKHOME)/source/pnglib
-
-BUFRFLAGS        = -O
-
-HAVEMOTIF        = yes
-
-include $(NAWIPS)/config/Makeinc.$(NA_OS)
diff --git a/sci-geosciences/gempak/files/gempak.env.d b/sci-geosciences/gempak/files/gempak.env.d
deleted file mode 100644
index 4fd015a31fdd..000000000000
--- a/sci-geosciences/gempak/files/gempak.env.d
+++ /dev/null
@@ -1,56 +0,0 @@
-NAWIPS=/usr/gempak
-GARPHOME=/usr/gempak/comet/garp
-GARP_PATH=/usr/gempak/comet/garp/config
-NA_OS=linux
-GEMPAK=/usr/gempak/gempak
-GEMPAKHOME=/usr/gempak/gempak
-GEMLIB=/usr/gempak/lib/linux
-GEMEXE=/usr/gempak/bin/linux
-GEMPDF=/usr/gempak/gempak/pdf
-GEMTBL=/usr/gempak/gempak/tables
-GEMERR=/usr/gempak/gempak/error
-GEMHLP=/usr/gempak/gempak/help
-GEMMAPS=/usr/gempak/gempak/maps
-GEMNTS=/usr/gempak/gempak/nts
-GEMPARM=/usr/gempak/gempak/parm
-GEMPTXT=/usr/gempak/gempak/txt/programs
-GEMGTXT=/usr/gempak/gempak/txt/gemlib
-NAWIPS_EXE=/usr/gempak/bin/linux
-NAWIPS_LIB=/usr/gempak/lib/linux
-NAWIPS_INC=/usr/gempak/include
-NAWIPS_HELP=/usr/gempak/help
-NAWIPS_TABLES=/usr/gempak/tables
-NWX_TABLES=/usr/gempak/tables/nwx
-NMAP_RESTORE=/usr/gempak/gempak/nts/nmap/restore
-MEL_BUFR=/usr/gempak/gempak/source/melbufr
-MEL_BUFR_TABLES=/usr/gempak/gempak/tables/melbufr
-BRDGDIR=/usr/gempak/unidata/ldmbridge
-xresources="/usr/gempak/resource/%N"
-SCRIPTS_EXE=/usr/gempak/bin/scripts
-PATH=/usr/gempak/bin/linux:/usr/gempak/bin/scripts
-ROOTPATH=/usr/gempak/bin/linux:/usr/gempak/bin/scripts
-GEMDATA=/usr/gempak/data
-OBS=/usr/gempak/data
-NTRANS_META=/usr/gempak/data/meta
-TEXT_DATA=/usr/gempak/data/nwx
-SAT=/usr/gempak/data/images/sat
-RAD=/usr/gempak/data/images/radar
-RADDIR=/usr/gempak/data/images/radar
-LDMDATA=/usr/ldm/data
-GOES8=/usr/gempak/data/images/sat/GOES-8
-GOES9=/usr/gempak/data/images/sat/GOES-9
-HDS=/usr/gempak/data/hds
-MODEL=/usr/gempak/data/model
-SAO=/usr/gempak/data/surface
-UPA=/usr/gempak/data/upperair
-RAW_SAO=/usr/ldm/data/surface/sao
-RAW_SYN=/usr/ldm/data/surface/syn
-RAW_UPA=/usr/ldm/data/upperair
-NLDN=/usr/gempak/data/nldn
-TORN_WARN=/usr/gempak/data/nwx/watch_warn/torn_warn
-TSTRM_WARN=/usr/gempak/data/nwx/watch_warn/tstrm_warn
-TEXT_WARN=/usr/gempak/data/nwx/watch_warn
-RBKGPH=/usr/gempak/data/redbook
-LP="lpr"
-XUSERFILESEARCHPATH="/usr/gempak/resource/%N"
-grids=/usr/gempak/data/model
diff --git a/sci-geosciences/gempak/gempak-5.7.2_p2.ebuild b/sci-geosciences/gempak/gempak-5.7.2_p2.ebuild
deleted file mode 100644
index 9041365ca64b..000000000000
--- a/sci-geosciences/gempak/gempak-5.7.2_p2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gempak/gempak-5.7.2_p2.ebuild,v 1.8 2012/10/24 19:37:20 ulm Exp $
-
-EAPI=1
-
-inherit eutils
-
-# They can't seem to retain a normal naming scheme, so hacks are required.
-# Often the hacks change on every bump.
-MY_PV="${PV/_}"
-MY_P="${PN}_upc${MY_PV}"
-
-DESCRIPTION="GEMPAK Meteorological Plotting and Analysis Package"
-HOMEPAGE="http://www.unidata.ucar.edu/packages/gempak"
-SRC_URI="${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-RESTRICT="fetch"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=x11-libs/motif-2.3:0"
-
-# More inconsistencies, this sometimes changes on bumps.
-S="${WORKDIR}/GEMPAK${MY_PV}"
-
-pkg_setup() {
-	# Define this here so we don't have to have it more than once.
-	GENTOO_VARS="NAWIPS GARPHOME GARP_PATH NA_OS GEMPAK GEMPAKHOME GEMLIB GEMEXE
-		GEMPDF GEMTBL GEMERR GEMHLP GEMMAPS GEMNTS GEMPARM GEMPTXT GEMGTXT
-		NAWIPS_EXE NAWIPS_LIB NAWIPS_INC NAWIPS_HELP NAWIPS_TABLES NWX_TABLES
-		NMAP_RESTORE MEL_BUFR MEL_BUFR_TABLES BRDGDIR xresources SCRIPTS_EXE
-		GEMDATA OBS NTRANS_META TEXT_DATA SAT RAD RADDIR LDMDATA GOES8 GOES9 HDS
-		MODEL SAO UPA RAW_SAO RAW_SYN RAW_UPA NLDN TORN_WARN TSTRM_WARN
-		TEXT_WARN RBKGPH LP XUSERFILESEARCHPATH grids"
-}
-
-pkg_nofetch() {
-	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}."
-}
-
-src_unpack() {
-	setup_vars
-
-	unpack ${A}
-
-	ebegin "Applying miscellaneous fixes"
-		# Add needed definition
-		sed -e '/^GEMPAKHOME/iNAWIPS           = ${S}' ${FILESDIR}/Makeinc.common >> ${CONFIGDIR}/Makeinc.common
-
-		# One of the GEMPAK cleanup scripts uses '$RM' instead of 'rm'.
-		sed -i -e 's/^\$RM/rm/' ${S}/bin/scripts/cleanvgf
-
-		# Eliminate bad symlink
-		# rm ${S}/unidata/programs/gpnexr2/rsl_colors
-
-		# This is necessary because otherwise it freaks out due to a missing
-		# lib/linux.
-		mkdir -p lib/linux
-	eend 0
-
-	# This is necessary because the paths to some bitmaps are hard-coded.
-	# epatch ${FILESDIR}/${PV}-gui.c.patch
-
-	# Fix changed header
-	header_replace varargs.h stdarg.h
-
-	# Can't install to /usr/local
-	ebegin "Fixing bad install locations"
-		for BADFILE in `grep -lr '/usr/local' ${S}`
-			do sed -i "s:/usr/local:/usr:g" ${BADFILE} ;
-		done
-	eend 0
-}
-
-src_compile() {
-	setup_vars
-
-	make || die
-}
-
-src_install() {
-	setup_vars
-
-	einfo "Pre-installing GEMPAK..."
-	make install || die
-
-	# This eliminates all the Makefiles, source code, header files,
-	# and sundry other useless files.
-	ebegin "Removing unnecessary files"
-		rm -rf ${S}/{config,include,ldm,lib,netcdf,nprogs,unidata,gempak/source}
-		rm -rf ${S}/comet/{dcshef,etamap,garp/{gempak,gui,include,init,object,util}}
-		rm ${S}/{,gempak/,comet/{,garp/}}Makefile
-	eend 0
-
-	# Create the directory to install GEMPAK to.
-	dodir usr/gempak
-
-	# Create the skeleton directory hierarchy for GEMPAK data.
-	keepdir usr/gempak/data/images/radar/nids
-	keepdir usr/gempak/data/images/sat/GOES-East
-	keepdir usr/gempak/data/meta
-	keepdir usr/gempak/data/model
-	keepdir usr/gempak/data/nldn
-	keepdir usr/gempak/data/nwx
-	keepdir usr/gempak/data/redbook
-	keepdir usr/gempak/data/surface
-	keepdir usr/gempak/data/upperair
-	dosym usr/gempak/data/model usr/gempak/data/model/hds
-	dosym usr/gempak/data/model usr/gempak/data/model/hrs
-
-	# Put all the necessary files in the correct place.
-	einfo "Installing GEMPAK..."
-	cp -Rfv ${S}/* ${D}/usr/gempak
-
-	# This is necessary, because otherwise some of the files will not be
-	# world-readable
-	ebegin "Fixing permissions to ensure world-readability"
-		chmod +r -Rf ${D}
-	eend 0
-
-	# Install env.d file
-	newenvd "${FILESDIR}"/gempak.env.d 10gempak
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "A skeleton directory hierarchy has been automatically"
-	einfo "created in /usr/gempak/data.  If you wish to use a"
-	einfo "different path you will need to edit /etc/env.d/10gempak"
-	einfo "to reflect the change.  If you already have a directory"
-	einfo "hierarchy of your own, then simply remove /usr/gempak/data"
-	einfo "and create a symbolic link from your data path to"
-	einfo "/usr/gempak/data.  Updates/uninstalls of GEMPAK will not"
-	einfo "affect the symlinked directories, so long as they have data"
-	einfo "inside them."
-	einfo ""
-	einfo "NOTE:  Some of the programs in the GEMPAK suite have paths"
-	einfo "hardcoded into the executables. It is ill-advised"
-	einfo "to start playing around with paths unless you know"
-	einfo "what you are doing."
-	einfo ""
-}
-
-header_replace() {
-	# Replace obsoleted header
-	# Usage: header_fix oldheader newheader
-	ebegin "Replacing obsolete header references"
-		for OLDFILE in `grep -lr "${1}" ${S}`
-			do sed -i "s:${1}:${2}:g" ${OLDFILE} ;
-		done
-	eend 0
-}
-
-setup_vars() {
-	# All GEMPAK paths need to be unset before attempting to compile.
-	unset ${GENTOO_VARS}
-
-	# These GEMPAK paths must be set to their new values before
-	# compiling.
-	export CONFIGDIR="${S}/config"
-	export GARPHOME="${S}/comet/garp"
-	export NA_OS="linux"
-	export NAWIPS="${S}"
-}
diff --git a/sci-geosciences/gempak/gempak-5.7.4.ebuild b/sci-geosciences/gempak/gempak-5.7.4.ebuild
deleted file mode 100644
index 05b0f55ca658..000000000000
--- a/sci-geosciences/gempak/gempak-5.7.4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gempak/gempak-5.7.4.ebuild,v 1.9 2012/10/24 19:37:20 ulm Exp $
-
-EAPI=1
-
-inherit eutils
-
-# They can't seem to retain a normal naming scheme, so hacks are required.
-# Often the hacks change on every bump.
-MY_PV="${PV/_}"
-MY_P="${PN}_upc${MY_PV}"
-
-DESCRIPTION="GEMPAK Meteorological Plotting and Analysis Package"
-HOMEPAGE="http://www.unidata.ucar.edu/packages/gempak"
-SRC_URI="${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-RESTRICT="fetch"
-
-DEPEND=">=x11-libs/motif-2.3:0"
-RDEPEND="${DEPEND}"
-
-# More inconsistencies, this sometimes changes on bumps.
-S="${WORKDIR}/GEMPAK${MY_PV}"
-
-pkg_setup() {
-	# Define this here so we don't have to have it more than once.
-	GENTOO_VARS="NAWIPS GARPHOME GARP_PATH NA_OS GEMPAK GEMPAKHOME GEMLIB GEMEXE
-		GEMPDF GEMTBL GEMERR GEMHLP GEMMAPS GEMNTS GEMPARM GEMPTXT GEMGTXT
-		NAWIPS_EXE NAWIPS_LIB NAWIPS_INC NAWIPS_HELP NAWIPS_TABLES NWX_TABLES
-		NMAP_RESTORE MEL_BUFR MEL_BUFR_TABLES BRDGDIR xresources SCRIPTS_EXE
-		GEMDATA OBS NTRANS_META TEXT_DATA SAT RAD RADDIR LDMDATA GOES8 GOES9 HDS
-		MODEL SAO UPA RAW_SAO RAW_SYN RAW_UPA NLDN TORN_WARN TSTRM_WARN
-		TEXT_WARN RBKGPH LP XUSERFILESEARCHPATH grids"
-}
-
-pkg_nofetch() {
-	elog "Please visit ${HOMEPAGE}"
-	elog "and place ${A} in ${DISTDIR}."
-}
-
-src_unpack() {
-	setup_vars
-
-	unpack ${A}
-
-	ebegin "Applying miscellaneous fixes"
-		# Add needed definition
-		sed -e '/^GEMPAKHOME/iNAWIPS           = ${S}' ${FILESDIR}/Makeinc.common >> ${CONFIGDIR}/Makeinc.common
-
-		# One of the GEMPAK cleanup scripts uses '$RM' instead of 'rm'.
-		sed -i -e 's/^\$RM/rm/' ${S}/bin/scripts/cleanvgf
-
-		# Eliminate bad symlink
-		# rm ${S}/unidata/programs/gpnexr2/rsl_colors
-
-		# This is necessary because otherwise it freaks out due to a missing
-		# lib/linux.
-		mkdir -p lib/linux
-	eend 0
-
-	# This is necessary because the paths to some bitmaps are hard-coded.
-	# epatch ${FILESDIR}/${PV}-gui.c.patch
-
-	# Fix changed header
-	header_replace varargs.h stdarg.h
-
-	# Can't install to /usr/local
-	ebegin "Fixing bad install locations"
-		for BADFILE in `grep -lr '/usr/local' ${S}`
-			do sed -i "s:/usr/local:/usr:g" ${BADFILE} ;
-		done
-	eend 0
-}
-
-src_compile() {
-	setup_vars
-
-	make || die
-}
-
-src_install() {
-	setup_vars
-
-	einfo "Pre-installing GEMPAK..."
-	make install || die
-
-	# This eliminates all the Makefiles, source code, header files,
-	# and sundry other useless files.
-	ebegin "Removing unnecessary files"
-		rm -rf ${S}/{config,include,ldm,lib,netcdf,nprogs,unidata,gempak/source}
-		rm -rf ${S}/comet/{dcshef,etamap,garp/{gempak,gui,include,init,object,util}}
-		rm ${S}/{,gempak/,comet/{,garp/}}Makefile
-	eend 0
-
-	# Create the directory to install GEMPAK to.
-	dodir usr/gempak
-
-	# Create the skeleton directory hierarchy for GEMPAK data.
-	keepdir usr/gempak/data/images/radar/nids
-	keepdir usr/gempak/data/images/sat/GOES-East
-	keepdir usr/gempak/data/meta
-	keepdir usr/gempak/data/model
-	keepdir usr/gempak/data/nldn
-	keepdir usr/gempak/data/nwx
-	keepdir usr/gempak/data/redbook
-	keepdir usr/gempak/data/surface
-	keepdir usr/gempak/data/upperair
-	dosym usr/gempak/data/model usr/gempak/data/model/hds
-	dosym usr/gempak/data/model usr/gempak/data/model/hrs
-
-	# Put all the necessary files in the correct place.
-	einfo "Installing GEMPAK..."
-	cp -Rfv ${S}/* ${D}/usr/gempak
-
-	# This is necessary, because otherwise some of the files will not be
-	# world-readable
-	ebegin "Fixing permissions to ensure world-readability"
-		chmod +r -Rf ${D}
-	eend 0
-
-	# Install env.d file
-	newenvd ${FILESDIR}/gempak.env.d 10gempak
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "A skeleton directory hierarchy has been automatically"
-	einfo "created in /usr/gempak/data.  If you wish to use a"
-	einfo "different path you will need to edit /etc/env.d/10gempak"
-	einfo "to reflect the change.  If you already have a directory"
-	einfo "hierarchy of your own, then simply remove /usr/gempak/data"
-	einfo "and create a symbolic link from your data path to"
-	einfo "/usr/gempak/data.  Updates/uninstalls of GEMPAK will not"
-	einfo "affect the symlinked directories, so long as they have data"
-	einfo "inside them."
-	einfo ""
-	einfo "NOTE:  Some of the programs in the GEMPAK suite have paths"
-	einfo "hardcoded into the executables. It is ill-advised"
-	einfo "to start playing around with paths unless you know"
-	einfo "what you are doing."
-	einfo ""
-}
-
-header_replace() {
-	# Replace obsoleted header
-	# Usage: header_fix oldheader newheader
-	ebegin "Replacing obsolete header references"
-		for OLDFILE in `grep -lr "${1}" ${S}`
-			do sed -i "s:${1}:${2}:g" ${OLDFILE} ;
-		done
-	eend 0
-}
-
-setup_vars() {
-	# All GEMPAK paths need to be unset before attempting to compile.
-	unset ${GENTOO_VARS}
-
-	# These GEMPAK paths must be set to their new values before
-	# compiling.
-	export CONFIGDIR="${S}/config"
-	export GARPHOME="${S}/comet/garp"
-	export NA_OS="linux"
-	export NAWIPS="${S}"
-}
diff --git a/sci-geosciences/gempak/metadata.xml b/sci-geosciences/gempak/metadata.xml
deleted file mode 100644
index d21d11884553..000000000000
--- a/sci-geosciences/gempak/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-geosciences</herd>
-</pkgmetadata>
diff --git a/sci-libs/gdal/gdal-1.10.1.ebuild b/sci-libs/gdal/gdal-1.10.1.ebuild
index e3b87d2ac3e7..fb93c4219326 100644
--- a/sci-libs/gdal/gdal-1.10.1.ebuild
+++ b/sci-libs/gdal/gdal-1.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-libs/gdal/gdal-1.10.1.ebuild,v 1.4 2014/04/26 15:41:22 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild,v 1.5 2014/05/04 08:23:26 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl ogdi pdf perl png postgres python ruby spatialite sqlite threads xls"
 
 RDEPEND="
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild
index c9dcd7c0bde8..74aa81e35f90 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.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/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild,v 1.3 2013/07/27 14:58:13 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild,v 1.4 2014/05/03 15:44:12 tomka Exp $
 
 EAPI=5
 
@@ -69,7 +69,7 @@ pkg_setup () {
 		append-cppflags "-I/usr/include/frobby"
 		# gtest needs python:2. Setting it with python_export preserves
 		# the exported variables in other phases too.
-		python_export python2_7
+		python_export python2_7 PYTHON EPYTHON
 }
 
 src_prepare() {
diff --git a/sci-mathematics/gimps/gimps-27.9-r2.ebuild b/sci-mathematics/gimps/gimps-27.9-r2.ebuild
index b4190be20d12..348fedb7cdd2 100644
--- a/sci-mathematics/gimps/gimps-27.9-r2.ebuild
+++ b/sci-mathematics/gimps/gimps-27.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/sci-mathematics/gimps/gimps-27.9-r2.ebuild,v 1.2 2014/04/13 18:05:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-27.9-r2.ebuild,v 1.3 2014/05/04 08:31:07 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GIMPS"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 # Since there are no statically linked binaries for this version of mprime,
diff --git a/sys-apps/accountsservice/accountsservice-0.6.37.ebuild b/sys-apps/accountsservice/accountsservice-0.6.37.ebuild
index e19283cdac50..61aa99715aa0 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.37.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.37.ebuild
@@ -1,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/accountsservice/accountsservice-0.6.37.ebuild,v 1.1 2014/04/25 22:57:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.37.ebuild,v 1.3 2014/05/04 12:12:33 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="doc +introspection selinux systemd"
 
diff --git a/sys-apps/lmctfy/Manifest b/sys-apps/lmctfy/Manifest
index d515d00e954d..f5103cea421c 100644
--- a/sys-apps/lmctfy/Manifest
+++ b/sys-apps/lmctfy/Manifest
@@ -1,2 +1,4 @@
 DIST lmctfy-0.1.0.tar.gz 2294616 SHA256 6d306a5630501a6723133b064ededfd942aa00a0dfa21155ebd5e07b07256624 SHA512 9cfa523fe04ef210f0700b8796700447aad839eceb448aafc3aff0a073b62d438fb6d3b8dee9b168358e3e1b7c2958f6db360dd78e20809b22b218cc14f555e7 WHIRLPOOL c9391f16f37bb0eaf7a20be3869a692f60aa40eb6b07d57f0ef61611c76b9e161f59f7f82ad90fb3eb2388f136ab29bad76ef182ba7147f5469ef6b561e3cdef
 DIST lmctfy-0.2.0.tar.gz 2291473 SHA256 b99310179ca36397074ca4719d8611a5cd567db967641214d365cefa95264f41 SHA512 533990025a9a88e2e2a467e571a80a5b057a0ef3523bfc71c155ad81e6a89463d1e1e094323d5dc875f1b86f4d2d2749819d10b8d6c781e06a93bd37747f12be WHIRLPOOL 5d3a71175dc02bc297ab8d7dfae599f70ea5185b815b6de96f21d466372f6c3c13306417a544127fd0b640f87ab5e460d8882e8c1623fa88d3f9d1a890cec836
+DIST lmctfy-0.3.0.tar.gz 2305226 SHA256 7b334456546b590d9298a3204b38ff91acc51409cc1fb2de0e92737faf017384 SHA512 9083af2d2b9ea34e6dbb911a24cf7b8a7fe5aa3a0f464d20115db86b5abac530d24122079f97ea2ef98bf4fb20a3980e598d89f38b570ba796665b0af08339d5 WHIRLPOOL 5371392de1eda88cd9b7f56f0bf032f3f3023201be43d15f4340092a756d1d6039537693ad3326666905ca91336dee251326e0fe5ab9bc4074783f0cd2e3fbce
+DIST lmctfy-0.3.1.tar.gz 2312481 SHA256 a04a52617501d8f486b34e64b34225dc8ef3c18c47ef92c870cd67879e6587b5 SHA512 ab9f2a065a49fae00b540c0592d9356022ba14e0f9dc681731e0757c259f3632a9b34b5fc629eaf2d0943d59e7747af06cfe59a64f447192e8c196a9d41b9522 WHIRLPOOL 40a3198aa7e03f46350ddec8fe7f20f1c8ced8929a10f23b7306967230df18977bb05c725f9817e1fe10e153ab61ac5c58b1ee13516fdc505d7f85ec562e5e53
diff --git a/sys-apps/lmctfy/lmctfy-0.3.0.ebuild b/sys-apps/lmctfy/lmctfy-0.3.0.ebuild
new file mode 100644
index 000000000000..2bf29d500451
--- /dev/null
+++ b/sys-apps/lmctfy/lmctfy-0.3.0.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/sys-apps/lmctfy/lmctfy-0.3.0.ebuild,v 1.1 2014/05/03 04:12:14 patrick Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Linux application container management from Google"
+HOMEPAGE="https://github.com/google/lmctfy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-libs/protobuf
+	dev-cpp/gflags
+	dev-libs/re2
+	"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	# test deps take too long to compile
+	use test && emake || emake lmctfy liblmctfy.a
+}
+
+src_install() {
+	# silly upstream!
+	mkdir -p "${D}/usr/bin"
+	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
+	dolib.a "${S}/bin/liblmctfy.a" || die "Failed to copy library"
+}
diff --git a/sys-apps/lmctfy/lmctfy-0.3.1.ebuild b/sys-apps/lmctfy/lmctfy-0.3.1.ebuild
new file mode 100644
index 000000000000..51977c83afba
--- /dev/null
+++ b/sys-apps/lmctfy/lmctfy-0.3.1.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/sys-apps/lmctfy/lmctfy-0.3.1.ebuild,v 1.1 2014/05/04 08:50:11 patrick Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Linux application container management from Google"
+HOMEPAGE="https://github.com/google/lmctfy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-libs/protobuf
+	dev-cpp/gflags
+	dev-libs/re2
+	"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	# test deps take too long to compile
+	use test && emake || emake lmctfy liblmctfy.a
+}
+
+src_install() {
+	# silly upstream!
+	mkdir -p "${D}/usr/bin"
+	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
+	dolib.a "${S}/bin/liblmctfy.a" || die "Failed to copy library"
+}
diff --git a/sys-apps/systemd-ui/Manifest b/sys-apps/systemd-ui/Manifest
index 749f51d12168..b68ca93dbdc6 100644
--- a/sys-apps/systemd-ui/Manifest
+++ b/sys-apps/systemd-ui/Manifest
@@ -1 +1,2 @@
 DIST systemd-ui-2.tar.xz 149892 SHA256 fa45819cd9419a8928a49097c879148f195944c9ed2b842310af58ab5254a694 SHA512 f2bd63cf16c63935f3099d896537c43fb0dd1c4840fffb1a602d87f0ceebf74eb256530c3c7121e042107b54a75145cc6922d2754a230a4fd8d7a48b8e8bc682 WHIRLPOOL 092e592cc68a0c02dc3eda4197691f3ff1d12a0e9379872bfe4b6478415081552867e84bc14650d236eae181a7b85ef010d3544f780ae83eda5ee2d498ed1966
+DIST systemd-ui-3.tar.xz 153680 SHA256 455e65000abf39bbccd937786b5f0d7c76ea631b6f28d7142f007fa141338dad SHA512 babc81dc6c205b3b95d19b4c762e2658c02942db884384f25324f63b4dca3cdafdb1b12e1a63ff33f9ff0c8152529cc700a1173c888cf4f6e3a9f0992889c9cd WHIRLPOOL 8f4f9b07c9debf2396581652ea8192bea954a25b8bd94157b0f7f836a6290c62b1ed82df61bdb48a3597774337ce3f4cfdd60c8799e73db92b25a35c9f3e5ab0
diff --git a/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch b/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch
new file mode 100644
index 000000000000..ce5df6c75ce9
--- /dev/null
+++ b/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch
@@ -0,0 +1,35 @@
+From 282a352dff49c13e185d826af2a248b55988bc32 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 29 Apr 2014 20:20:51 +0000
+Subject: Fix ambiguity between `GLib.Notification' and `Notify.Notification'
+
+Notification is both defined by Notify and the latest GLib, resulting in
+a build failure. Use Notify.Notification instead to avoid this
+ambiguity.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746130
+---
+diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
+index 571cd94..f3887dd 100644
+--- a/src/gnome-ask-password-agent.vala
++++ b/src/gnome-ask-password-agent.vala
+@@ -80,7 +80,7 @@ public class MyStatusIcon : StatusIcon {
+         string socket;
+ 
+         PasswordDialog password_dialog;
+-        Notification n;
++        Notify.Notification n;
+ 
+         public MyStatusIcon() throws GLib.Error {
+                 GLib.Object(icon_name : "dialog-password");
+@@ -183,7 +183,7 @@ public class MyStatusIcon : StatusIcon {
+                 }
+                 set_from_icon_name(icon);
+ 
+-                n = new Notification(title, message, icon);
++                n = new Notify.Notification(title, message, icon);
+                 n.set_timeout(5000);
+                 n.closed.connect(() => {
+                         set_visible(true);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/sys-apps/systemd-ui/systemd-ui-2.ebuild b/sys-apps/systemd-ui/systemd-ui-2.ebuild
index cb882b0c6085..42d323bef06a 100644
--- a/sys-apps/systemd-ui/systemd-ui-2.ebuild
+++ b/sys-apps/systemd-ui/systemd-ui-2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-2.ebuild,v 1.5 2014/01/07 09:58:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-2.ebuild,v 1.6 2014/05/04 05:33:56 tetromino Exp $
 
 EAPI=4
 
 # Needed per https://bugs.freedesktop.org/show_bug.cgi?id=69643#c5
 VALA_MIN_API_VERSION=0.22
+VALA_MAX_API_VERSION=0.22 # fails with vala-0.24; should be fixed in >=systemd-ui-4
 
 inherit autotools-utils systemd vala
 
diff --git a/sys-apps/systemd-ui/systemd-ui-3.ebuild b/sys-apps/systemd-ui/systemd-ui-3.ebuild
new file mode 100644
index 000000000000..c7e4b81db9c1
--- /dev/null
+++ b/sys-apps/systemd-ui/systemd-ui-3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-3.ebuild,v 1.2 2014/05/04 08:07:01 pacho Exp $
+
+EAPI=5
+
+# Needed per https://bugs.freedesktop.org/show_bug.cgi?id=69643#c5
+VALA_MIN_API_VERSION=0.22
+
+inherit autotools-utils systemd vala
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	!sys-apps/systemd[gtk]
+	>=dev-libs/glib-2.26:2
+	dev-libs/libgee:0.8
+	sys-apps/dbus
+	x11-libs/gtk+:2
+	>=x11-libs/libnotify-0.7
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	$(vala_depend)
+"
+
+# Due to vala being broken.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/${P}-vala-0.24.patch" )
+
+src_prepare() {
+	# Force the rebuild of .vala sources
+	touch src/*.vala || die
+
+	# Fix hardcoded path in .vala.
+	sed -i -e "s^/lib/systemd^$(systemd_get_utildir)^g" src/*.vala || die
+
+	autotools-utils_src_prepare
+	vala_src_prepare
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 041298f06b75..6efa9fa4dddc 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,3 @@
 DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
-DIST systemd-208.277.tar.xz 2358628 SHA256 08af5b55711554cd3b8a8b7b1758210ba590e1eb7deb79f4062154ae7228019f SHA512 29caee143300f888aea0104e819e2788e5f7ddec9f503414e03f3aef4eb273d01a61efddcfb83328959a60433b533f4c023154dd37ecdab217394875e5b74f60 WHIRLPOOL 43423158f9bb5a433c36b792d0a1503b0187fc9fcfdced8136857245895e637888046342b6749e4927386a6f5a545cd32dd8036971fe98e5f947b33d69c860d6
 DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d55ea38b0013a6f2d0863f2c2 SHA512 3e6dac77785cb2f928886886f92cdd11ed00a4db1453699e0102d3ecffa03d1795f44df10239105e4b2b039f0e3e4b5d44c9f876f25c10a6dc4f7e1fbf87c333 WHIRLPOOL 31d1a967435963155c60ca5016f207aa105e9ddcb7d73e9fcde20f7e1fb66701384b81ee01134bf4d75dfa1ea0d412bb352ff11ac6f8c05e836135baf94bbe37
 DIST systemd-gentoo-patchset-208_p19.tar.bz2 7351 SHA256 3fce1d7ff628b0f49d4bf45eb7beb7d3b4a45c219464be47e4b04e5e16ace335 SHA512 d2ee48a46a8dc097f41d23c58c2c8f40841b42ce175d633ba0090543164c353449a911c5f314b1d1aa7937e51b97cc2608aa4590f0ff56140b42108b0e76a2e8 WHIRLPOOL 934fd88ee12ed72709e0b7aabe01f9e21417480156049af80eaa5413d50726aa49abc03e756bdeff45a4f82decaafa1f76539f16b2319e3c42a0a593f2096417
diff --git a/sys-apps/systemd/files/204-0001-polkit-Avoid-race-condition-in-scraping-proc.patch b/sys-apps/systemd/files/204-0001-polkit-Avoid-race-condition-in-scraping-proc.patch
deleted file mode 100644
index c7d6bb18940a..000000000000
--- a/sys-apps/systemd/files/204-0001-polkit-Avoid-race-condition-in-scraping-proc.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From a8a49c004f69220e2c8ed209152a5a570acf49f3 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 22 Aug 2013 13:55:21 -0400
-Subject: [PATCH 1/4] polkit: Avoid race condition in scraping /proc
-
-If a calling process execve()s a setuid program, it can appear to be
-uid 0.  Since we're receiving requests over DBus, avoid this by simply
-passing system-bus-name as a subject.
----
- src/shared/polkit.c | 31 +++++--------------------------
- 1 file changed, 5 insertions(+), 26 deletions(-)
-
-diff --git a/src/shared/polkit.c b/src/shared/polkit.c
-index cea7074..1c5e9e3 100644
---- a/src/shared/polkit.c
-+++ b/src/shared/polkit.c
-@@ -38,12 +38,8 @@ int verify_polkit(
- 
- #ifdef ENABLE_POLKIT
-         DBusMessage *m = NULL, *reply = NULL;
--        const char *unix_process = "unix-process", *pid = "pid", *starttime = "start-time", *cancel_id = "";
-+        const char *system_bus_name = "system-bus-name", *name = "name", *cancel_id = "";
-         uint32_t flags = interactive ? 1 : 0;
--        pid_t pid_raw;
--        uint32_t pid_u32;
--        unsigned long long starttime_raw;
--        uint64_t starttime_u64;
-         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
-         int r;
-         dbus_bool_t authorized = FALSE, challenge = FALSE;
-@@ -68,14 +64,6 @@ int verify_polkit(
- 
- #ifdef ENABLE_POLKIT
- 
--        pid_raw = bus_get_unix_process_id(c, sender, error);
--        if (pid_raw == 0)
--                return -EINVAL;
--
--        r = get_starttime_of_pid(pid_raw, &starttime_raw);
--        if (r < 0)
--                return r;
--
-         m = dbus_message_new_method_call(
-                         "org.freedesktop.PolicyKit1",
-                         "/org/freedesktop/PolicyKit1/Authority",
-@@ -86,22 +74,13 @@ int verify_polkit(
- 
-         dbus_message_iter_init_append(m, &iter_msg);
- 
--        pid_u32 = (uint32_t) pid_raw;
--        starttime_u64 = (uint64_t) starttime_raw;
--
-         if (!dbus_message_iter_open_container(&iter_msg, DBUS_TYPE_STRUCT, NULL, &iter_struct) ||
--            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &unix_process) ||
-+            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &system_bus_name) ||
-             !dbus_message_iter_open_container(&iter_struct, DBUS_TYPE_ARRAY, "{sv}", &iter_array) ||
-             !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
--            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &pid) ||
--            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant) ||
--            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &pid_u32) ||
--            !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
--            !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
--            !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
--            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &starttime) ||
--            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "t", &iter_variant) ||
--            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT64, &starttime_u64) ||
-+            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &name) ||
-+            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "s", &iter_variant) ||
-+            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_STRING, &sender) ||
-             !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
-             !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
-             !dbus_message_iter_close_container(&iter_struct, &iter_array) ||
--- 
-1.8.3.2
-
diff --git a/sys-apps/systemd/files/204-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch b/sys-apps/systemd/files/204-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch
deleted file mode 100644
index e7c5b7a421de..000000000000
--- a/sys-apps/systemd/files/204-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 03b8b6c88f10cfbfc398b206989739b899e6dbd1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 31 Jul 2013 23:12:17 +0200
-Subject: [PATCH 2/4] Add /usr/share/keymaps to localectl supported locations.
-
-This is the standard upstream location where kbd installs keymaps.
----
- src/locale/localectl.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 50250c4..856d9a9 100644
---- a/src/locale/localectl.c
-+++ b/src/locale/localectl.c
-@@ -537,6 +537,7 @@ static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) {
-         if (!keymaps)
-                 return log_oom();
- 
-+        nftw("/usr/share/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
-         nftw("/usr/share/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
-         nftw("/usr/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
-         nftw("/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
--- 
-1.8.3.2
-
diff --git a/sys-apps/systemd/files/204-0003-Allow-tabs-in-environment-files.patch b/sys-apps/systemd/files/204-0003-Allow-tabs-in-environment-files.patch
deleted file mode 100644
index 9f277965fc6e..000000000000
--- a/sys-apps/systemd/files/204-0003-Allow-tabs-in-environment-files.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 105804e6bdaa05309937b1a6a1167539545b1774 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 11 Sep 2013 21:50:16 -0400
-Subject: [PATCH 3/4] Allow tabs in environment files
-
-bash allows them, and so should we.
-
-string_has_cc is changed to allow tabs, and if they are not wanted,
-they must be now checked for explicitly. There are two other callers,
-apart from the env file loaders, and one already checked anyway, and
-the other is changed to check.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=68592
-https://bugs.gentoo.org/show_bug.cgi?id=481554
-
-Conflicts:
-	src/test/test-fileio.c
----
- src/hostname/hostnamed.c | 3 ++-
- src/shared/util.c        | 4 ++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index 0437e33..6a43aeb 100644
---- a/src/hostname/hostnamed.c
-+++ b/src/hostname/hostnamed.c
-@@ -553,7 +553,8 @@ static DBusHandlerResult hostname_message_handler(
-                                  * safe than sorry */
-                                 if (k == PROP_ICON_NAME && !filename_is_safe(name))
-                                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
--                                if (k == PROP_PRETTY_HOSTNAME && string_has_cc(name))
-+                                if (k == PROP_PRETTY_HOSTNAME &&
-+                                    (string_has_cc(name) || chars_intersect(name, "\t")))
-                                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
-                                 if (k == PROP_CHASSIS && !valid_chassis(name))
-                                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
-diff --git a/src/shared/util.c b/src/shared/util.c
-index 673e0da..113133f 100644
---- a/src/shared/util.c
-+++ b/src/shared/util.c
-@@ -5264,6 +5264,10 @@ bool string_is_safe(const char *p) {
-         return true;
- }
- 
-+/**
-+ * Check if a string contains control characters.
-+ * Spaces and tabs are not considered control characters.
-+ */
- bool string_has_cc(const char *p) {
-         const char *t;
- 
--- 
-1.8.3.2
-
diff --git a/sys-apps/systemd/files/204-0004-Actually-allow-tabs-in-environment-files.patch b/sys-apps/systemd/files/204-0004-Actually-allow-tabs-in-environment-files.patch
deleted file mode 100644
index 046ea0859ede..000000000000
--- a/sys-apps/systemd/files/204-0004-Actually-allow-tabs-in-environment-files.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 349cfe2fd3d521c474881b486eb56bb07111d1d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Thu, 12 Sep 2013 10:03:16 -0400
-Subject: [PATCH 4/4] Actually allow tabs in environment files
-
-Fixup for ac4c8d6da8b5e.
----
- src/shared/util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/shared/util.c b/src/shared/util.c
-index 113133f..c9e9b87 100644
---- a/src/shared/util.c
-+++ b/src/shared/util.c
-@@ -5274,7 +5274,7 @@ bool string_has_cc(const char *p) {
-         assert(p);
- 
-         for (t = p; *t; t++)
--                if (*t > 0 && *t < ' ')
-+                if (*t > 0 && *t < ' ' && *t != '\t')
-                         return true;
- 
-         return false;
--- 
-1.8.3.2
-
diff --git a/sys-apps/systemd/files/207-0001-swap-fix-reverse-dependencies.patch b/sys-apps/systemd/files/207-0001-swap-fix-reverse-dependencies.patch
deleted file mode 100644
index 2f6e3a656269..000000000000
--- a/sys-apps/systemd/files/207-0001-swap-fix-reverse-dependencies.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 625f65ad929cb293aebe22622fd1bc3d1dd8a6ac Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Fri, 13 Sep 2013 14:46:18 +0200
-Subject: [PATCH 1/2] swap: fix reverse dependencies
-
-Make sure swap.target correctly requires/wants the swap units.
-
-This fixes https://bugs.freedesktop.org/show_bug.cgi?id=69291.
-
-Reported-by: Hussam Al-Tayeb
----
- src/core/swap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/swap.c b/src/core/swap.c
-index 57d15eb..3950860 100644
---- a/src/core/swap.c
-+++ b/src/core/swap.c
-@@ -220,7 +220,7 @@ static int swap_add_default_dependencies(Swap *s) {
-         }
- 
-         if (!noauto) {
--                r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, (nofail ? UNIT_WANTED_BY : UNIT_REQUIRED_BY),
-+                r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, (nofail ? UNIT_WANTS : UNIT_REQUIRES),
-                                                       SPECIAL_SWAP_TARGET, NULL, true);
-                 if (r < 0)
-                         return r;
--- 
-1.8.3.2
-
diff --git a/sys-apps/systemd/files/207-0002-swap-create-.wants-symlink-to-auto-swap-devices.patch b/sys-apps/systemd/files/207-0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
deleted file mode 100644
index 4ed046b530b1..000000000000
--- a/sys-apps/systemd/files/207-0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 0a74184d5bc2cb50360ccc9bc0238a421816417a Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Mon, 16 Sep 2013 01:08:32 +0200
-Subject: [PATCH 2/2] swap: create .wants symlink to 'auto' swap devices
-
-As we load unit files lazily, we need to make sure something pulls in swap
-units that should be started automatically, otherwise the default dependencies
-will never be applied.
-
-This partially reinstates code removed in
-commit 64347fc2b983f33e7efb0fd2bb44e133fb9f30f4.
-
-Also don't order swap devices after swap.target when they are 'nofail'.
----
- src/core/swap.c                       |  8 ++++++--
- src/fstab-generator/fstab-generator.c | 18 ++++++++++++++++--
- 2 files changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/src/core/swap.c b/src/core/swap.c
-index 3950860..76c7d45 100644
---- a/src/core/swap.c
-+++ b/src/core/swap.c
-@@ -220,8 +220,12 @@ static int swap_add_default_dependencies(Swap *s) {
-         }
- 
-         if (!noauto) {
--                r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, (nofail ? UNIT_WANTS : UNIT_REQUIRES),
--                                                      SPECIAL_SWAP_TARGET, NULL, true);
-+                if (nofail)
-+                        r = unit_add_dependency_by_name_inverse(UNIT(s),
-+                                UNIT_WANTS, SPECIAL_SWAP_TARGET, NULL, true);
-+                else
-+                        r = unit_add_two_dependencies_by_name_inverse(UNIT(s),
-+                                UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SWAP_TARGET, NULL, true);
-                 if (r < 0)
-                         return r;
-         }
-diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 6ebe8aa..b73dfa4 100644
---- a/src/fstab-generator/fstab-generator.c
-+++ b/src/fstab-generator/fstab-generator.c
-@@ -66,6 +66,7 @@ static int mount_find_pri(struct mntent *me, int *ret) {
- static int add_swap(const char *what, struct mntent *me) {
-         _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL;
-         _cleanup_fclose_ FILE *f = NULL;
-+        bool noauto;
-         int r, pri = -1;
- 
-         assert(what);
-@@ -77,6 +78,8 @@ static int add_swap(const char *what, struct mntent *me) {
-                 return pri;
-         }
- 
-+        noauto = !!hasmntopt(me, "noauto");
-+
-         name = unit_name_from_path(what, ".swap");
-         if (!name)
-                 return log_oom();
-@@ -97,8 +100,7 @@ static int add_swap(const char *what, struct mntent *me) {
-         fprintf(f,
-                 "# Automatically generated by systemd-fstab-generator\n\n"
-                 "[Unit]\n"
--                "SourcePath=/etc/fstab\n"
--                "\n"
-+                "SourcePath=/etc/fstab\n\n"
-                 "[Swap]\n"
-                 "What=%s\n",
-                 what);
-@@ -114,6 +116,18 @@ static int add_swap(const char *what, struct mntent *me) {
-                 return -errno;
-         }
- 
-+        if (!noauto) {
-+                lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
-+                if (!lnk)
-+                        return log_oom();
-+
-+                mkdir_parents_label(lnk, 0755);
-+                if (symlink(unit, lnk) < 0) {
-+                        log_error("Failed to create symlink %s: %m", lnk);
-+                        return -errno;
-+                }
-+        }
-+
-         return 0;
- }
- 
--- 
-1.8.3.2
-
diff --git a/sys-apps/systemd/files/208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch b/sys-apps/systemd/files/208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch
deleted file mode 100644
index 7ddad4dd6dd5..000000000000
--- a/sys-apps/systemd/files/208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c0b3a7fbf668320f7710c85c8e9799ad3722300c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 2 Oct 2013 10:08:33 +0200
-Subject: [PATCH] Work-around: link libsystemd-label to libsystemd-login.
-
-This has been fixed upstream by moving the code around but adding
-the linking gives much less patching.
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8d9c587..dc85ac3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3918,6 +3918,7 @@ libsystemd_login_la_LDFLAGS = \
- libsystemd_login_la_LIBADD = \
- 	libsystemd-shared.la \
- 	libsystemd-daemon-internal.la \
-+	libsystemd-label.la \
- 	$(RT_LIBS)
- 
- libsystemd_login_internal_la_SOURCES = \
--- 
-1.8.3.2
-
diff --git a/sys-apps/systemd/files/208-0002-Update-Makefile.in.patch b/sys-apps/systemd/files/208-0002-Update-Makefile.in.patch
deleted file mode 100644
index c2bb9c52a16d..000000000000
--- a/sys-apps/systemd/files/208-0002-Update-Makefile.in.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 74f96de2cdf89c75f1a619364d90c787ec63d2f5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 2 Oct 2013 10:23:49 +0200
-Subject: [PATCH] Update Makefile.in.
-
----
- Makefile.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f0b7893..02bd630 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1422,7 +1422,7 @@ libsystemd_login_internal_la_OBJECTS =  \
- @ENABLE_LOGIND_TRUE@libsystemd_login_la_DEPENDENCIES =  \
- @ENABLE_LOGIND_TRUE@	libsystemd-shared.la \
- @ENABLE_LOGIND_TRUE@	libsystemd-daemon-internal.la \
--@ENABLE_LOGIND_TRUE@	$(am__DEPENDENCIES_1)
-+@ENABLE_LOGIND_TRUE@	libsystemd-label.la $(am__DEPENDENCIES_1)
- am__libsystemd_login_la_SOURCES_DIST = src/login/sd-login.c \
- 	src/systemd/sd-login.h src/login/login-shared.c \
- 	src/login/login-shared.h
-@@ -6096,6 +6096,7 @@ dist_catalog_DATA = \
- @ENABLE_LOGIND_TRUE@libsystemd_login_la_LIBADD = \
- @ENABLE_LOGIND_TRUE@	libsystemd-shared.la \
- @ENABLE_LOGIND_TRUE@	libsystemd-daemon-internal.la \
-+@ENABLE_LOGIND_TRUE@	libsystemd-label.la \
- @ENABLE_LOGIND_TRUE@	$(RT_LIBS)
- 
- @ENABLE_LOGIND_TRUE@libsystemd_login_internal_la_SOURCES = \
--- 
-1.8.3.2
-
diff --git a/sys-apps/systemd/files/gentoo-run.conf b/sys-apps/systemd/files/gentoo-run.conf
deleted file mode 100644
index 5b3bcab8f338..000000000000
--- a/sys-apps/systemd/files/gentoo-run.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# New OpenRC versions replace /var/lock with a symlink to /run/lock.
-# We just create that directory for now, just in case.
-# Of course, it's not guaranteed that'll satisfy all relevant packages.
-
-d /run/lock 0755 root root -
diff --git a/sys-apps/systemd/files/var-lock.mount b/sys-apps/systemd/files/var-lock.mount
deleted file mode 100644
index 07277adac3a2..000000000000
--- a/sys-apps/systemd/files/var-lock.mount
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Lock Directory
-Before=local-fs.target
-# skip mounting if the directory does not exist or is a symlink
-ConditionPathIsDirectory=/var/lock
-ConditionPathIsSymbolicLink=!/var/lock
-
-[Mount]
-What=/run/lock
-Where=/var/lock
-Type=bind
-Options=bind
diff --git a/sys-apps/systemd/files/var-run.mount b/sys-apps/systemd/files/var-run.mount
deleted file mode 100644
index ab4da424c966..000000000000
--- a/sys-apps/systemd/files/var-run.mount
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Runtime Directory
-Before=local-fs.target
-# skip mounting if the directory does not exist or is a symlink
-ConditionPathIsDirectory=/var/run
-ConditionPathIsSymbolicLink=!/var/run
-
-[Mount]
-What=/run
-Where=/var/run
-Type=bind
-Options=bind
diff --git a/sys-apps/systemd/systemd-208-r2.ebuild b/sys-apps/systemd/systemd-208-r2.ebuild
deleted file mode 100644
index ced1a3c91489..000000000000
--- a/sys-apps/systemd/systemd-208-r2.ebuild
+++ /dev/null
@@ -1,388 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v 1.20 2014/03/01 22:37:05 mgorny Exp $
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
-	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
-	user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz -> ${P}-r1.tar.xz
-	http://dev.gentoo.org/~mgorny/dist/${PN}-gentoo-patchset-${PV}_p19.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
-	+kmod lzma pam policykit python qrcode selinux tcpd test
-	vanilla xattr"
-
-MINKV="3.0"
-
-COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
-	>=sys-apps/util-linux-2.20
-	sys-libs/libcap
-	acl? ( sys-apps/acl )
-	audit? ( >=sys-process/audit-2 )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 )
-	gudev? ( >=dev-libs/glib-2[${MULTILIB_USEDEP}] )
-	http? ( net-libs/libmicrohttpd )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-14-r1 )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xattr? ( sys-apps/attr )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	|| (
-		>=sys-apps/util-linux-2.22
-		<sys-apps/sysvinit-2.88-r4
-	)
-	!sys-auth/nss-myhostname
-	!<sys-libs/glibc-2.10
-	!sys-fs/udev"
-
-PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-devel/binutils-2.23.1
-	>=sys-devel/gcc-4.6
-	>=sys-kernel/linux-headers-${MINKV}
-	ia64? ( >=sys-kernel/linux-headers-3.9 )
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.18 )"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
-		~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
-		~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
-		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
-		~!GRKERNSEC_PROC"
-
-	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-	use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-	use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR"
-	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-	use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
-
-	if linux_config_exists; then
-		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4
-			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
-		then
-			eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
-			eerror "gcc version using gcc-config."
-			die "systemd requires at least gcc 4.6"
-		fi
-	fi
-
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		if ! use firmware-loader && kernel_is -lt 3 8; then
-			ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
-			ewarn "require systemd with USE=firmware-loader to support loading"
-			ewarn "firmware. Missing this flag may cause some hardware not to work."
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}"/${PN}-gentoo-patchset*/*.patch
-	)
-
-	# Bug 463376
-	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
-	autotools-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--with-pamlibdir=$(getpam_mod_dir)
-		# avoid bash-completion dep
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in $PATH
-		--enable-split-usr
-		# disable sysv compatibility
-		--with-sysvinit-path=
-		--with-sysvrcnd-path=
-		# no deps
-		--enable-efi
-		--enable-ima
-		# optional components/dependencies
-		$(use_enable acl)
-		$(use_enable audit)
-		$(use_enable cryptsetup libcryptsetup)
-		$(use_enable doc gtk-doc)
-		$(use_enable gcrypt)
-		$(use_enable gudev)
-		$(use_enable http microhttpd)
-		$(use_enable introspection)
-		$(use_enable kmod)
-		$(use_enable lzma xz)
-		$(use_enable pam)
-		$(use_enable policykit polkit)
-		$(use_enable python python-devel)
-		$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
-		$(use_enable qrcode qrencode)
-		$(use_enable selinux)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable test tests)
-		$(use_enable xattr)
-
-		# not supported (avoid automagic deps in the future)
-		--disable-chkconfig
-
-		# hardcode a few paths to spare some deps
-		QUOTAON=/usr/sbin/quotaon
-		QUOTACHECK=/usr/sbin/quotacheck
-	)
-
-	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(get_udevdir)
-
-	if use firmware-loader; then
-		myeconfargs+=(
-			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myeconfargs+=(
-			ac_cv_search_cap_init=
-			ac_cv_header_sys_capability_h=yes
-			DBUS_CFLAGS=' '
-			DBUS_LIBS=' '
-
-			--disable-acl
-			--disable-audit
-			--disable-gcrypt
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-kmod
-			--disable-libcryptsetup
-			--disable-microhttpd
-			--disable-pam
-			--disable-polkit
-			--disable-qrencode
-			--disable-selinux
-			--disable-tcpwrap
-			--disable-tests
-			--disable-xattr
-			--disable-xz
-			--disable-python-devel
-		)
-	fi
-
-	# Work around bug 463846.
-	tc-export CC
-
-	autotools-utils_src_configure
-}
-
-multilib_src_compile() {
-	local mymakeopts=(
-		udevlibexecdir="${MY_UDEVDIR}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}"
-	else
-		# prerequisites for gudev
-		use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
-
-		echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
-		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || continue
-
-	default
-}
-
-multilib_src_install() {
-	local mymakeopts=(
-		# automake fails with parallel libtool relinking
-		# https://bugs.gentoo.org/show_bug.cgi?id=491398
-		-j1
-
-		udevlibexecdir="${MY_UDEVDIR}"
-		dist_udevhwdb_DATA=
-		DESTDIR="${D}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}" install
-	else
-		mymakeopts+=(
-			install-libLTLIBRARIES
-			install-pkgconfiglibDATA
-			install-includeHEADERS
-			# safe to call unconditionally, 'installs' empty list
-			install-libgudev_includeHEADERS
-			install-pkgincludeHEADERS
-		)
-
-		emake "${mymakeopts[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-	einstalldocs
-
-	# we just keep sysvinit tools, so no need for the mans
-	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-		|| die
-	rm "${D}"/usr/share/man/man1/init.1 || die
-
-	# Disable storing coredumps in journald, bug #433457
-	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
-	local locale_conf="${EROOT%/}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# if locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_postinst() {
-	enewgroup systemd-journal
-	if use http; then
-		enewgroup systemd-journal-gateway
-		enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
-	fi
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 468876
-	fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-
-	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
-		ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
-		ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
-		ewarn "and 'mount' to not work properly. Please run:"
-		ewarn "	# ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-		ewarn
-	fi
-
-	if ! has_version sys-apps/systemd-ui; then
-		elog "To get additional features, a number of optional runtime dependencies may"
-		elog "be installed:"
-		elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-208-r3.ebuild b/sys-apps/systemd/systemd-208-r3.ebuild
index 8543d5c13d10..fcf51cd3fb83 100644
--- a/sys-apps/systemd/systemd-208-r3.ebuild
+++ b/sys-apps/systemd/systemd-208-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/sys-apps/systemd/systemd-208-r3.ebuild,v 1.3 2014/03/01 22:37:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild,v 1.6 2014/05/03 17:35:41 mgorny Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz -> ${P}-r1.tar.
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
 	+kmod lzma pam policykit python qrcode selinux tcpd test
 	vanilla xattr"
@@ -137,6 +137,15 @@ src_prepare() {
 	autotools-utils_src_prepare
 }
 
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--localstatedir=/var
@@ -180,9 +189,6 @@ multilib_src_configure() {
 		QUOTACHECK=/usr/sbin/quotacheck
 	)
 
-	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(get_udevdir)
-
 	if use firmware-loader; then
 		myeconfargs+=(
 			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
diff --git a/sys-apps/systemd/systemd-208.277.ebuild b/sys-apps/systemd/systemd-208.277.ebuild
deleted file mode 100644
index 2ef8877d348b..000000000000
--- a/sys-apps/systemd/systemd-208.277.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208.277.ebuild,v 1.1 2014/03/04 23:13:20 mgorny Exp $
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
-	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
-	user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
-	+kmod lzma pam policykit python qrcode selinux tcpd test
-	vanilla xattr"
-
-MINKV="3.0"
-
-COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
-	>=sys-apps/util-linux-2.20
-	sys-libs/libcap
-	acl? ( sys-apps/acl )
-	audit? ( >=sys-process/audit-2 )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 )
-	gudev? ( >=dev-libs/glib-2[${MULTILIB_USEDEP}] )
-	http? ( net-libs/libmicrohttpd )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-14-r1 )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xattr? ( sys-apps/attr )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	|| (
-		>=sys-apps/util-linux-2.22
-		<sys-apps/sysvinit-2.88-r4
-	)
-	!sys-auth/nss-myhostname
-	!<sys-libs/glibc-2.10
-	!sys-fs/udev"
-
-PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-devel/binutils-2.23.1
-	>=sys-devel/gcc-4.6
-	>=sys-kernel/linux-headers-${MINKV}
-	ia64? ( >=sys-kernel/linux-headers-3.9 )
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.18 )"
-
-src_prepare() {
-	# Bug 463376
-	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
-	autotools-utils_src_prepare
-}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
-		~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
-		~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
-		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
-		~!GRKERNSEC_PROC"
-
-	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-	use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-	use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR"
-	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-	use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
-
-	if linux_config_exists; then
-		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4
-			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
-		then
-			eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
-			eerror "gcc version using gcc-config."
-			die "systemd requires at least gcc 4.6"
-		fi
-	fi
-
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		if ! use firmware-loader && kernel_is -lt 3 8; then
-			ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
-			ewarn "require systemd with USE=firmware-loader to support loading"
-			ewarn "firmware. Missing this flag may cause some hardware not to work."
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--with-pamlibdir=$(getpam_mod_dir)
-		# avoid bash-completion dep
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in $PATH
-		--enable-split-usr
-		# disable sysv compatibility
-		--with-sysvinit-path=
-		--with-sysvrcnd-path=
-		# no deps
-		--enable-efi
-		--enable-ima
-		# optional components/dependencies
-		$(use_enable acl)
-		$(use_enable audit)
-		$(use_enable cryptsetup libcryptsetup)
-		$(use_enable doc gtk-doc)
-		$(use_enable gcrypt)
-		$(use_enable gudev)
-		$(use_enable http microhttpd)
-		$(use_enable introspection)
-		$(use_enable kmod)
-		$(use_enable lzma xz)
-		$(use_enable pam)
-		$(use_enable policykit polkit)
-		$(use_enable python python-devel)
-		$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
-		$(use_enable qrcode qrencode)
-		$(use_enable selinux)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable test tests)
-		$(use_enable xattr)
-
-		# not supported (avoid automagic deps in the future)
-		--disable-chkconfig
-
-		# hardcode a few paths to spare some deps
-		QUOTAON=/usr/sbin/quotaon
-		QUOTACHECK=/usr/sbin/quotacheck
-	)
-
-	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(get_udevdir)
-
-	if use firmware-loader; then
-		myeconfargs+=(
-			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myeconfargs+=(
-			ac_cv_search_cap_init=
-			ac_cv_header_sys_capability_h=yes
-			DBUS_CFLAGS=' '
-			DBUS_LIBS=' '
-
-			--disable-acl
-			--disable-audit
-			--disable-gcrypt
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-kmod
-			--disable-libcryptsetup
-			--disable-microhttpd
-			--disable-pam
-			--disable-polkit
-			--disable-qrencode
-			--disable-selinux
-			--disable-tcpwrap
-			--disable-tests
-			--disable-xattr
-			--disable-xz
-			--disable-python-devel
-		)
-	fi
-
-	# Work around bug 463846.
-	tc-export CC
-
-	autotools-utils_src_configure
-}
-
-multilib_src_compile() {
-	local mymakeopts=(
-		udevlibexecdir="${MY_UDEVDIR}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}"
-	else
-		# prerequisites for gudev
-		use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
-
-		echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
-		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || continue
-
-	default
-}
-
-multilib_src_install() {
-	local mymakeopts=(
-		# automake fails with parallel libtool relinking
-		# https://bugs.gentoo.org/show_bug.cgi?id=491398
-		-j1
-
-		udevlibexecdir="${MY_UDEVDIR}"
-		dist_udevhwdb_DATA=
-		DESTDIR="${D}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}" install
-	else
-		mymakeopts+=(
-			install-libLTLIBRARIES
-			install-pkgconfiglibDATA
-			install-includeHEADERS
-			# safe to call unconditionally, 'installs' empty list
-			install-libgudev_includeHEADERS
-			install-pkgincludeHEADERS
-		)
-
-		emake "${mymakeopts[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-	einstalldocs
-
-	# we just keep sysvinit tools, so no need for the mans
-	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-		|| die
-	rm "${D}"/usr/share/man/man1/init.1 || die
-
-	# Disable storing coredumps in journald, bug #433457
-	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
-	local locale_conf="${EROOT%/}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# if locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_postinst() {
-	enewgroup systemd-journal
-	if use http; then
-		enewgroup systemd-journal-gateway
-		enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
-	fi
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 468876
-	fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-
-	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
-		ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
-		ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
-		ewarn "and 'mount' to not work properly. Please run:"
-		ewarn "	# ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-		ewarn
-	fi
-
-	if ! has_version sys-apps/systemd-ui; then
-		elog "To get additional features, a number of optional runtime dependencies may"
-		elog "be installed:"
-		elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-208.9999.ebuild b/sys-apps/systemd/systemd-208.9999.ebuild
deleted file mode 100644
index 82549f1bbca7..000000000000
--- a/sys-apps/systemd/systemd-208.9999.ebuild
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208.9999.ebuild,v 1.3 2014/03/04 23:13:20 mgorny Exp $
-
-EAPI=5
-
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}-stable
-	http://cgit.freedesktop.org/${PN}/${PN}-stable/"
-EGIT_BRANCH=v208-stable
-
-inherit git-r3
-#endif
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
-	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
-	user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
-	+kmod lzma pam policykit python qrcode selinux tcpd test
-	vanilla xattr"
-
-MINKV="3.0"
-
-COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
-	>=sys-apps/util-linux-2.20
-	sys-libs/libcap
-	acl? ( sys-apps/acl )
-	audit? ( >=sys-process/audit-2 )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 )
-	gudev? ( >=dev-libs/glib-2[${MULTILIB_USEDEP}] )
-	http? ( net-libs/libmicrohttpd )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-14-r1 )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xattr? ( sys-apps/attr )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	|| (
-		>=sys-apps/util-linux-2.22
-		<sys-apps/sysvinit-2.88-r4
-	)
-	!sys-auth/nss-myhostname
-	!<sys-libs/glibc-2.10
-	!sys-fs/udev"
-
-PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-devel/binutils-2.23.1
-	>=sys-devel/gcc-4.6
-	>=sys-kernel/linux-headers-${MINKV}
-	ia64? ( >=sys-kernel/linux-headers-3.9 )
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.18 )"
-
-#if LIVE
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	dev-libs/gobject-introspection
-	>=dev-libs/libgcrypt-1.4.5:0"
-
-SRC_URI=
-KEYWORDS=
-#endif
-
-src_prepare() {
-#if LIVE
-	if use doc; then
-		gtkdocize --docdir docs/ || die
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
-	fi
-
-#endif
-	# Bug 463376
-	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
-	autotools-utils_src_prepare
-}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
-		~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
-		~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
-		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
-		~!GRKERNSEC_PROC"
-
-	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-	use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-	use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR"
-	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-	use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
-
-	if linux_config_exists; then
-		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4
-			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
-		then
-			eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
-			eerror "gcc version using gcc-config."
-			die "systemd requires at least gcc 4.6"
-		fi
-	fi
-
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		if ! use firmware-loader && kernel_is -lt 3 8; then
-			ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
-			ewarn "require systemd with USE=firmware-loader to support loading"
-			ewarn "firmware. Missing this flag may cause some hardware not to work."
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--with-pamlibdir=$(getpam_mod_dir)
-		# avoid bash-completion dep
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in $PATH
-		--enable-split-usr
-		# disable sysv compatibility
-		--with-sysvinit-path=
-		--with-sysvrcnd-path=
-		# no deps
-		--enable-efi
-		--enable-ima
-		# optional components/dependencies
-		$(use_enable acl)
-		$(use_enable audit)
-		$(use_enable cryptsetup libcryptsetup)
-		$(use_enable doc gtk-doc)
-		$(use_enable gcrypt)
-		$(use_enable gudev)
-		$(use_enable http microhttpd)
-		$(use_enable introspection)
-		$(use_enable kmod)
-		$(use_enable lzma xz)
-		$(use_enable pam)
-		$(use_enable policykit polkit)
-		$(use_enable python python-devel)
-		$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
-		$(use_enable qrcode qrencode)
-		$(use_enable selinux)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable test tests)
-		$(use_enable xattr)
-
-		# not supported (avoid automagic deps in the future)
-		--disable-chkconfig
-
-		# hardcode a few paths to spare some deps
-		QUOTAON=/usr/sbin/quotaon
-		QUOTACHECK=/usr/sbin/quotacheck
-	)
-
-	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(get_udevdir)
-
-	if use firmware-loader; then
-		myeconfargs+=(
-			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myeconfargs+=(
-			ac_cv_search_cap_init=
-			ac_cv_header_sys_capability_h=yes
-			DBUS_CFLAGS=' '
-			DBUS_LIBS=' '
-
-			--disable-acl
-			--disable-audit
-			--disable-gcrypt
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-kmod
-			--disable-libcryptsetup
-			--disable-microhttpd
-			--disable-pam
-			--disable-polkit
-			--disable-qrencode
-			--disable-selinux
-			--disable-tcpwrap
-			--disable-tests
-			--disable-xattr
-			--disable-xz
-			--disable-python-devel
-		)
-	fi
-
-	# Work around bug 463846.
-	tc-export CC
-
-	autotools-utils_src_configure
-}
-
-multilib_src_compile() {
-	local mymakeopts=(
-		udevlibexecdir="${MY_UDEVDIR}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}"
-	else
-		# prerequisites for gudev
-		use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
-
-		echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
-		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || continue
-
-	default
-}
-
-multilib_src_install() {
-	local mymakeopts=(
-		# automake fails with parallel libtool relinking
-		# https://bugs.gentoo.org/show_bug.cgi?id=491398
-		-j1
-
-		udevlibexecdir="${MY_UDEVDIR}"
-		dist_udevhwdb_DATA=
-		DESTDIR="${D}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}" install
-	else
-		mymakeopts+=(
-			install-libLTLIBRARIES
-			install-pkgconfiglibDATA
-			install-includeHEADERS
-			# safe to call unconditionally, 'installs' empty list
-			install-libgudev_includeHEADERS
-			install-pkgincludeHEADERS
-		)
-
-		emake "${mymakeopts[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-	einstalldocs
-
-	# we just keep sysvinit tools, so no need for the mans
-	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-		|| die
-	rm "${D}"/usr/share/man/man1/init.1 || die
-
-	# Disable storing coredumps in journald, bug #433457
-	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
-	local locale_conf="${EROOT%/}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# if locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_postinst() {
-	enewgroup systemd-journal
-	if use http; then
-		enewgroup systemd-journal-gateway
-		enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
-	fi
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 468876
-	fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-
-	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
-		ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
-		ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
-		ewarn "and 'mount' to not work properly. Please run:"
-		ewarn "	# ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-		ewarn
-	fi
-
-	if ! has_version sys-apps/systemd-ui; then
-		elog "To get additional features, a number of optional runtime dependencies may"
-		elog "be installed:"
-		elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-212-r3.ebuild b/sys-apps/systemd/systemd-212-r4.ebuild
similarity index 98%
rename from sys-apps/systemd/systemd-212-r3.ebuild
rename to sys-apps/systemd/systemd-212-r4.ebuild
index a03eb444c9d6..8948be1f7fc8 100644
--- a/sys-apps/systemd/systemd-212-r3.ebuild
+++ b/sys-apps/systemd/systemd-212-r4.ebuild
@@ -1,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/systemd/systemd-212-r3.ebuild,v 1.1 2014/05/02 09:10:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212-r4.ebuild,v 1.2 2014/05/03 17:35:41 mgorny Exp $
 
 EAPI=5
 
@@ -142,6 +142,15 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		# disable -flto since it is an optimization flag
@@ -198,9 +207,6 @@ multilib_src_configure() {
 		--with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
 	)
 
-	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(get_udevdir)
-
 	if use firmware-loader; then
 		myeconfargs+=(
 			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index d55e724b65bb..54f270402e69 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-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/sys-apps/systemd/systemd-9999.ebuild,v 1.106 2014/05/02 09:23:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.108 2014/05/03 17:35:41 mgorny Exp $
 
 EAPI=5
 
@@ -164,6 +164,15 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		# disable -flto since it is an optimization flag
@@ -220,9 +229,6 @@ multilib_src_configure() {
 		--with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
 	)
 
-	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(get_udevdir)
-
 	if use firmware-loader; then
 		myeconfargs+=(
 			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
diff --git a/sys-apps/uevt/uevt-2.3-r1.ebuild b/sys-apps/uevt/uevt-2.3-r1.ebuild
index c2d5c73b0635..07da3145c4f7 100644
--- a/sys-apps/uevt/uevt-2.3-r1.ebuild
+++ b/sys-apps/uevt/uevt-2.3-r1.ebuild
@@ -1,9 +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/uevt/uevt-2.3-r1.ebuild,v 1.5 2013/10/20 08:22:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/uevt/uevt-2.3-r1.ebuild,v 1.6 2014/05/04 05:54:15 tetromino Exp $
 
 EAPI=5
 VALA_MIN_API_VERSION="0.16"
+VALA_MAX_API_VERSION="0.22"
 inherit eutils vala
 
 DESCRIPTION="UPower/UDisks Event, a lightweight desktop-independent power and disk manager"
diff --git a/sys-cluster/keepalived/keepalived-1.2.12.ebuild b/sys-cluster/keepalived/keepalived-1.2.12-r1.ebuild
similarity index 95%
rename from sys-cluster/keepalived/keepalived-1.2.12.ebuild
rename to sys-cluster/keepalived/keepalived-1.2.12-r1.ebuild
index dad385b8ecdc..ee65102893bd 100644
--- a/sys-cluster/keepalived/keepalived-1.2.12.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.12-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-cluster/keepalived/keepalived-1.2.12.ebuild,v 1.1 2014/02/14 11:15:34 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.12-r1.ebuild,v 1.1 2014/05/04 14:49:17 ultrabug Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ IUSE="debug ipv6 snmp"
 
 RDEPEND="dev-libs/popt
 	sys-apps/iproute2
-	dev-libs/libnl:1.1
+	dev-libs/libnl
 	dev-libs/openssl
 	snmp? ( net-analyzer/net-snmp )"
 DEPEND="${RDEPEND}
diff --git a/sys-devel/autogen/autogen-5.18.1.ebuild b/sys-devel/autogen/autogen-5.18.1.ebuild
index 193fe2860957..4782802aabd6 100644
--- a/sys-devel/autogen/autogen-5.18.1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.18.1.ebuild,v 1.2 2014/04/29 20:42:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.18.1.ebuild,v 1.3 2014/05/03 14:18:32 maekke Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-1.8
diff --git a/sys-devel/bin86/bin86-0.16.20-r2.ebuild b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
index 9fd0f7db68d8..83122db58423 100644
--- a/sys-devel/bin86/bin86-0.16.20-r2.ebuild
+++ b/sys-devel/bin86/bin86-0.16.20-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-devel/bin86/bin86-0.16.20-r2.ebuild,v 1.2 2014/04/21 16:16:42 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.20-r2.ebuild,v 1.3 2014/05/04 08:27:57 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index c3c9c574c17f..8de2302191c9 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1 +1,2 @@
 DIST smatch-1.57.tar.gz 491677 SHA256 3ca08158f066887aa821da45962e4999ca60b459f3f13eb5ffc4d68c4b94cadb SHA512 031f417c97d58b617b2e375a28f509f71eb2735212a98aee0e21880a28842078ad3c24b5375a03f73d75fec582a9d187ed6a00a0512c4792e5ffce82dfd79b99 WHIRLPOOL 6eb43af471ba08c106fe05dc786422b16b20cb94bf9af2afdde3e9ccea6985bc5c3b39922e135d55b7a1b341187a77a9565b2ef27ff47f7214b6472b10b6d7c0
+DIST smatch-1.59.tar.gz 495530 SHA256 9c300600aace39fe67fde59421a159d6dffdc5d8ef074762a6a6a7c78e87d472 SHA512 5e18f48dbbe11255a06b427205aefd1f8f5a11bb0b238f9134b89e6f5cb838fcae649a4e87a4a04473a33077c94e88aab46b06e33cc87cfe451fa83b5846ccc7 WHIRLPOOL 5f8c115370acd876cb41c360dcb8916ca1a725aa3714b89261ab69122976440f01b20f8874ffd7dc93ac79479db69ce246a3d5cd8bbedf5c52f430eff0195522
diff --git a/sys-devel/smatch/smatch-1.59.ebuild b/sys-devel/smatch/smatch-1.59.ebuild
new file mode 100644
index 000000000000..95101afcded7
--- /dev/null
+++ b/sys-devel/smatch/smatch-1.59.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/smatch/smatch-1.59.ebuild,v 1.1 2014/05/03 16:30:04 vapier Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
+		http://repo.or.cz/r/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="static analysis tool for C"
+HOMEPAGE="http://smatch.sourceforge.net/"
+
+LICENSE="OSL-1.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-db/sqlite"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
+		Makefile || die
+}
+
+_emake() {
+	# gtk/llvm/xml is used by sparse which we don't install
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		V=1 \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LD='$(CC)' \
+		HAVE_GTK2=no \
+		HAVE_LLVM=no \
+		HAVE_LIBXML=no \
+		"$@"
+}
+
+src_compile() {
+	_emake smatch
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	# default install target installs a lot of sparse cruft
+	dobin smatch
+	insinto /usr/share/smatch/smatch_data
+	doins smatch_data/*
+	dodoc FAQ README
+}
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index aec2144d3154..9d9808d3baff 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,30 +1,23 @@
-# 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/sys-devel/smatch/smatch-9999.ebuild,v 1.3 2012/12/20 02:46:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/smatch/smatch-9999.ebuild,v 1.4 2014/05/03 16:30:04 vapier Exp $
 
 EAPI="4"
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
 	inherit git-2
+else
+	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="static analysis tool for C"
 HOMEPAGE="http://smatch.sourceforge.net/"
 
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	# The repo.or.cz site does not produce stable tarballs,
-	# so we have to cache our own copy of the snapshot.
-	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="mirror://gentoo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
 LICENSE="OSL-1.1"
 SLOT="0"
 IUSE=""
@@ -36,13 +29,30 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
 	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
 		Makefile || die
 }
 
+_emake() {
+	# gtk/llvm/xml is used by sparse which we don't install
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		V=1 \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LD='$(CC)' \
+		HAVE_GTK2=no \
+		HAVE_LLVM=no \
+		HAVE_LIBXML=no \
+		"$@"
+}
+
 src_compile() {
-	emake PREFIX=/usr V=1 CC="$(tc-getCC)" smatch
+	_emake smatch
+}
+
+src_test() {
+	_emake check
 }
 
 src_install() {
diff --git a/sys-firmware/tt-s2-6400-firmware/Manifest b/sys-firmware/tt-s2-6400-firmware/Manifest
index 6e7ad668ada6..76aebdcfaeef 100644
--- a/sys-firmware/tt-s2-6400-firmware/Manifest
+++ b/sys-firmware/tt-s2-6400-firmware/Manifest
@@ -1,4 +1,5 @@
 DIST dvb-ttpremium-fpga-01_v1_09.zip 86058 SHA256 bd6b10a56c85439d8d857112bc6b8771557b134e1efb0972c1ea59d7b79a4494 SHA512 2cf783990595f6fc46ad7129829ed2339186292621e0f13d7942313e49808ce5fb43bf4e0968ad317d6bd54343c39dfcd136268a50248bfb8f6c1c54ff9c5a12 WHIRLPOOL cb529f7808b3e203ff12ef300e447dd856375dc7643a7e3e16f96090473ac4deb4133d6d65dfc0242230c2934df0b8b52497cd74d0a9c535566a2c9985ed912c
+DIST dvb-ttpremium-fpga-01_v1_10.zip 90791 SHA256 d5f0ecd1c687549d71a21269c25791554895d8c03ff580a9694ef24041952f69 SHA512 7083a14a25945c7b310830cb3508e9c1e3922944fa3e778588ecf6dc6faa02aca2c8e6bf4c40db632a268324a936dce20ae26563fd195a5c8e1b29446f21c97c WHIRLPOOL f6175f6b443b551d3df545b0a54951eb5d9059256354a06e71463dede754140da9f48cc2bb3498d455da6340b36aab03c801b7eabb503254d355101e23041fb6
 DIST dvb-ttpremium-loader-01_v1_03.zip 9841 SHA256 99969d4740ca26332439590e6b6e86711c89be69cf94c3732267b8278c0da763 SHA512 d0fddfeadbf1f5bc06538033ea4b69ecc6a34e1b3a8239df93c347f7882ac6b7ee8b44eaef3eaff15c81bb084e3f985f8504d68edb83479e149d904fb97e2ce3 WHIRLPOOL 2632a19a542e3feb2d6b5446873147af49ccdccf7a202b7516aa7f07aab6fae68b2c6dea3a1da4a9dbede86b5aa0e865e1dc91db28322807aade727b8edd6214
 DIST dvb-ttpremium-st7109-01_v0_4_0.zip 2079060 SHA256 89ea7960f472b8381269d4b5c7575b6189283405c1e38ffaf62dcdfd005de499 SHA512 1f0788e1a5cc152eb7525e54e4c2eca942b2e62262d05c4c771ede9e159ff253c0ce958c18d6fc856c15ed07ddf6d0b7e85dea6e6fd4cac6cf9ce4128a0b54e4 WHIRLPOOL 1f0b8bc328b9aaef8b15c21d66788ae9c760fb860e5fab343416c044ed432e84872d264f240296842f481f9993061644b6b73b57977033e01a455c05602f5096
 DIST dvb-ttpremium-st7109-01_v0_4_1.zip 2069012 SHA256 cb2292e660b3ec6d898fe337d266492a29dcba3adf1a1b5a5fe5e839e8f0db25 SHA512 461ce62bc7103f04d7782ee053b43c35839b3202d140c962f5412747231f9932425f4c35a76ad205efc55719b4433f02838d3d6927d3ec35993e3763fa4adb80 WHIRLPOOL 987bed0455de0fbe9cef039fd4ab46e43bd47eddff703aef0718c31086826455a5ce3e4283d9c4853f0659e8fe76cb20e8ee400afda360935a1162da014fac20
diff --git a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.4.1-r1.ebuild b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..96fafd849f5f
--- /dev/null
+++ b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.4.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.4.1-r1.ebuild,v 1.1 2014/05/04 11:46:48 hd_brummy Exp $
+
+EAPI=5
+
+RESTRICT="mirror bindist"
+
+DESCRIPTION="Firmware for the Technotrend S2-6400 DVB Card"
+HOMEPAGE="http://www.aregel.de/"
+SRC_URI="http://www.aregel.de/file_download/24/dvb-ttpremium-st7109-01_v0_4_1.zip
+		http://www.aregel.de/file_download/26/dvb-ttpremium-fpga-01_v1_10.zip
+		http://www.aregel.de/file_download/7/dvb-ttpremium-loader-01_v1_03.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /lib/firmware
+	doins dvb-ttpremium-fpga-01.fw dvb-ttpremium-loader-01.fw dvb-ttpremium-st7109-01.fw
+}
diff --git a/sys-fs/s3ql/Manifest b/sys-fs/s3ql/Manifest
index 8bfce0002ac3..03c7279a23d5 100644
--- a/sys-fs/s3ql/Manifest
+++ b/sys-fs/s3ql/Manifest
@@ -1,6 +1,7 @@
 DIST s3ql-1.15.tar.bz2 944374 SHA256 3521aef6613fc523f5ec4762124361297ff5cdf15dbe1f1f1a658c9df473beb6 SHA512 152ada472d866ca8c37195511497f7256de1e8767400a8166d51d6beeb1a6e6948870d170e044324d7320c45076a314f8cce676fa41a205eb0c9da8a0093e4d0 WHIRLPOOL 00173c2f32d2e5df8fcddbb7d17fb08aadbea7511717f5a12e475ad140de8060a587cb1cce0efbef808ef7f676cd6ce66f3feedc5d0bbaf796a0b650ffa5bf5e
 DIST s3ql-1.16.tar.bz2 950071 SHA256 06cf4604384926ab7bd8581a2d9c31f3a60032888336991aca9efe8c679a5e38 SHA512 dbef33863e479e90b3db8b851a8cce6d19eb6479df297791c0585b05f87f9052d62696769edb5d9a4ea845e9c34d89f140a741fdcc5c7b0caff2412c30b3bc6f WHIRLPOOL ffcb12f1f9600ca98bd7db7e4eb5d6cea76c6aef351049f4e1b17ad3dcba3fa94b5134ab92f295fbea940ed1d58f2c9ce1ead93f1208362fb074698bcafe9802
 DIST s3ql-1.17.tar.bz2 935840 SHA256 f9a330f946456e7f58ddcc9f6cd51ce3dff759c700604d23aa1c86173e68fa55 SHA512 2b1541650e0e2ac56ef5993c24c7be7d65125ef25227a90fb4c79e5e5f384891d85b5627fe659d4641473d7d9cf24fa8b10f057290490c05bbf3f85ab6e2b37f WHIRLPOOL 45fef4bb25c1ccb38f7dcaf49f71c85dcba4f2146704b3bd0076868edf4b5f1fbd8e4d60823eb85708e992c5f7549e2a92fbf57ee7bcbb0f82f67bb7f772f154
+DIST s3ql-1.18.1.tar.bz2 638265 SHA256 e89cb8d243013142e1f4d8571036b0ba46dfb1a5a495ac5a1100f9753e1b77a5 SHA512 7c3d54889ee26b9e0acfbaeb8163c949496a19997724acf8b0e638db1056d8742b6ee1efe05f5668bf111523c56dbcc7eca4cc0b923d739eb10017ac51044a55 WHIRLPOOL 2e67d60d7cd6719b256ea505dd8158820053d8122403de8821db0a3fb9b6724ae4d91e869280be6acb8ad3f1be5ebc5935ed7f0915a5fb15d76cb545944c0e72
 DIST s3ql-2.2.tar.bz2 924093 SHA256 8ed9898217d8dc3b2c2e1636c6804fa179bbb18159a3d635199dc7205f9005c3 SHA512 f5091a70b31baec428ea3786051a598a38be83b8ef546cbd730c8d8e6b9c279e8a56ba443b37b74997ecc15b3f51138b7b79dea379f875847683e247a613031d WHIRLPOOL 5d511ec0d3d1d0eaaa44be32468424650b1bb1e6dfc3593f52e85f31f3d6e58fdd146ae0640dd808b1d296e5ccbc9454a072b3543fc32c6cf126c6a9f3c32399
 DIST s3ql-2.3.tar.bz2 929937 SHA256 7ca29ac40ea9b389dd432b5b7a2246d75e1411371a64fd16e264c66a2379cef8 SHA512 f0baa947ab6b8f3109b87e8a64032f72fcd1aeca81200e16c3b76cbfcb03e82704c8f645584a3e3372a912ec4961b17911df7ca7028b7fb43f0bdff5fa4bc2a6 WHIRLPOOL 730e776cf9ad5fb10f693092cba193c3e1508e81eb785f823578d27984cedf4759a19a5477cc0510e8a850cd4ea206a714b005d1e94a5f6800e5b6b22e8398a7
 DIST s3ql-2.4.tar.bz2 934438 SHA256 5c9438c77a25d3360c3d12542cd762b5688ca469d4902d25b92abcf333cc0f4c SHA512 56861877a1f45e1ca589f31838c9991fbf703690882592ad9046c2b42079695a8046050c85afdec6ca36dd5caf6d7c44aae8a3f9383ec8321cf9483854f2f518 WHIRLPOOL 01d36ad540cb49716c3acaf8f0f39d48c7796be0821719702efbd6b92aa511bfe31c02eeb819fad1ae6d43cedc953713c9c487e7223fbffe11dc941cb2ad1152
diff --git a/sys-fs/s3ql/s3ql-1.18.1.ebuild b/sys-fs/s3ql/s3ql-1.18.1.ebuild
new file mode 100644
index 000000000000..d4b70fa25e75
--- /dev/null
+++ b/sys-fs/s3ql/s3ql-1.18.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3ql/s3ql-1.18.1.ebuild,v 1.1 2014/05/03 08:27:25 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured file system for online data storage"
+HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
+SRC_URI="https://bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/llfuse-0.37[${PYTHON_USEDEP}]
+	dev-python/pycryptopp[${PYTHON_USEDEP}]
+	dev-python/pyliblzma[${PYTHON_USEDEP}]
+	sys-fs/fuse
+	virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		net-misc/rsync[xattr]
+		virtual/python-unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# use system setuptools
+	sed -i '/use_setuptools/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EUID} -ne 0 ]] ; then
+		ewarn "Skipping tests: root privileges are required so userpriv must be disabled"
+	else
+		addwrite /dev/fuse
+		esetup.py test
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use contrib ; then
+		exeinto /usr/share/doc/${PF}/contrib
+		docompress -x /usr/share/doc/${PF}/contrib
+		doexe contrib/*.{py,sh}
+		doman contrib/*.1
+	fi
+
+	if use doc ; then
+		dodoc doc/manual.pdf
+		dohtml -r doc/html/*
+	fi
+}
diff --git a/sys-kernel/genkernel-next/genkernel-next-55.ebuild b/sys-kernel/genkernel-next/genkernel-next-55.ebuild
index fc0a2e2ce5c4..5fb04c5ed7be 100644
--- a/sys-kernel/genkernel-next/genkernel-next-55.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-55.ebuild,v 1.2 2014/04/29 10:23:02 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-55.ebuild,v 1.3 2014/05/04 08:32:51 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ inherit bash-completion-r1 eutils
 if [[ "${PV}" == "9999" ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 ~arm ~ia64 ~x86"
+	KEYWORDS="amd64 ~arm ~ia64 x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index b12334530ad0..a0b576420268 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -59,6 +59,8 @@ DIST genpatches-3.2-33.base.tar.xz 1189004 SHA256 d52a458fc10862d47e606441329e69
 DIST genpatches-3.2-33.extras.tar.xz 17896 SHA256 98143e6dc6f706e85dca6a9ca6f0c4316a5c3f97ca00622b751fa2ec96fa87d1 SHA512 d96b8b45cd1eded1e96f2b8a0bbc2e24fc32cbb120c70f1e8093e680a9ae906775b2bff2b66a1160158f3ce36cc655bc68e947de998a48df2f2ae1f6e5f9da66 WHIRLPOOL f82d41ff42c520e835a02f9edb5cda23a1e3829c2ddc25da67aa547e8163ee6f0f1b365c9603afcc8e347def472b73b879e178e62239248b2b1267848503c2b4
 DIST genpatches-3.2-34.base.tar.xz 1242264 SHA256 fea3eae4e98dda2b11b3b0a5110bcfa8e79193479000e8eeaedc3e91fb5ef725 SHA512 37ee5196a72d1956e32eddd39747c0333d6f72cb88067bf88b0c85dee7e1d3ebbe9a335019f5910dae8e98041e94d72303fe66e0d251458311d00997b74bddfe WHIRLPOOL 65a8d4b9ff549a32beab15a28255da62932d993db96ce7c27e6144d2b87a6ef96530ce1adc250e968be503843061b5abd2f3f72becf30cbc17ee32d877a16325
 DIST genpatches-3.2-34.extras.tar.xz 17976 SHA256 c22f1e24503163bd7560e3db15e8183e00b4a99c421db325ba9a41a897b4f29e SHA512 167d90a56b3f7b901b58d0fe6791b5f1681f6f6369590a424815a746504a5b4ed7b12ec9106099c3930a2ecd996291f651b3e04957a83123981816e570b9f69b WHIRLPOOL 430f4e93bfd0ef3cc1a10a59772dd24c927f4c9c90d477d84587e211a6c4163ab5166db8bd9297edb6dcb5ca448c734c0c283dad9b1830ad3b1e3210b2bf53e2
+DIST genpatches-3.2-35.base.tar.xz 1266056 SHA256 3fff59e328914e3902178b18484ad01fda300d489b68f738e1111761a5abde9f SHA512 a67416e090f6b0b06802a69c93dee2940f54564934900a45dacdce529f142b246974ee1661f429ffefae267bf58166e79ce89a9f6a21e41d8962ede32430a496 WHIRLPOOL 1f5236641f01989bf86eb335c2d350654de7cc227e2cd03f26e4da74bcd8200b77feedc7e38141f78384326287f384364120ccab9f074e20d7ca60b151d4f2fe
+DIST genpatches-3.2-35.extras.tar.xz 17976 SHA256 f23c07ef5cd6fedd2b3fc481f46adabf96edb93207ec96d4ff0bad1de90b4de3 SHA512 79ea6a1e1c9607fea3c3a0e590ea986febc27004cf3918611d62b8ba8c0ab0b0d76be2688687d476b8ad4dfced5527ab520712858da9d8556b38f7b149716938 WHIRLPOOL 92e9f5726b69f61970f2d0166e42919bb3008228e043a481f2dfcb7ffa766d8b3dc5c32bc2729e0a5ad0d92f313d7162adeab16e3eff6a33e7a90a04ec8835a6
 DIST genpatches-3.4-65.base.tar.xz 989808 SHA256 95157de8e969bf5d0cd79cba72b13c712c90e70ff6464e2016131c815f9717bc SHA512 fb1691b114c9875dd7bbd9ad1602d33f39e674da7ce77961601053b5bed24bbe27fa640a83b48337126e6543bde751d3b9f568ffb45537c9e0163d2069df67cc WHIRLPOOL e83870bef3ed98a55a89a382aed0e9725fca5f1ea1daddb4fa359e43cffaadc3d53a79e52441c3f03427e063a1318afabe6cb02a4e9332005802ac14626753ee
 DIST genpatches-3.4-65.extras.tar.xz 18156 SHA256 9e1b05a44b97a13c0fea1df6533a68b6163cce1bf50fa39caee2691288b871ff SHA512 cd9ec0450ae9c87407fbea1440b4281afb0b3842d3a14cfb15058e7f179efc60003ed7f5d824fca07fa8cafacf35a507340b089b75235f2c1823ff11ebb4de96 WHIRLPOOL e3b42b8205a4d528b200a0d41b601e8c1b8310c1164f5d04f302ef804179418b0fc76fa0432a45637791818aedf39e6b947e6c9d2abae04f1f1d15f0fc7900f4
 DIST genpatches-3.4-66.base.tar.xz 1005528 SHA256 2766f8f1b199951a2ec9cefd6a072f3dd5cf4b533e7fa65a16d4153b308b4e5b SHA512 8f62c8b251f3684a21531c8eba8e0c2cc6e43b0f6dc5c2abbd9ee0038d25ea24017be97df7bd94f12e42c45846481a0532b02039a706e5a03883397dae1583df WHIRLPOOL ca8cf9433e2e722997a32f803ed216a4415f3e06bf3153518e3090eb2767fc6f4b2a1c4672fcb489169a7497ccdbdd4d5079942c0dbbdec4344a882559502019
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.2.58.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.2.58.ebuild
new file mode 100644
index 000000000000..313990ced53b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.2.58.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.2.58.ebuild,v 1.1 2014/05/03 23:51:44 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="35"
+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-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 048d660d7f1b..023de4c3c433 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -7,32 +7,19 @@ DIST deblob-check-3.13 612002 SHA256 55a9264ad886259c9b20f1365245a993482a0f593d0
 DIST deblob-check-3.14 613747 SHA256 e1d5ced14e38fd415eb5a9a50e180cfdc63b2d0f0350a6d36645b82ef0351304 SHA512 f5901a7c41db34ea3c29e6c6f6fa1afacf4edca1cfad901599b982fd66b5ce3894aa9075b5d15b7a8a6c9694833752fb609d98889b5de39ab59aea7d024a740b WHIRLPOOL 5064bf7423a4703a976b4342da5b3cef65584ee701462e261398170b3e5189036327e114deb15a29ded79541dbe084fa86b08b8c293d4585614ac09f791d7f60
 DIST deblob-check-3.2 423268 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638 SHA512 3abb9968ef4750fda90e4e2283981fd4691b7f9854244413b31d17bb60382a6d809fec929d8d3f9b52397dd9f9fa26783f4c3a25f3f4115b76ed585ea68e9916 WHIRLPOOL 891c3f809af470d680ae896c843c09612fb5124f2805e03d67b28ec4353bff0bc346ae9f680d900f0f63e681be86a0195f9baab7dcf3b5accfda739b106766fa
 DIST genpatches-3.11-10.base.tar.xz 164896 SHA256 02cea38d624fb6c830af164fe709e22c92cdfbfac2c752af4ff145681f5ae0ac SHA512 c80625740d5670ee511b90b7a2b29881b7b5f14b5276e0be7d7e307404788355cde252c46440c2c60fe117c1bb43bc24ba3323beaaf3aa415d44aabd194b52ef WHIRLPOOL 67f3825dd6a7c1b35d3a198c595646acb4f150904599ee8aab9999a92bebcb18ddd02f14fd01eac423518a94bdfc1fb61c97d1cc616ab96d326f622fe99a2bb2
-DIST genpatches-3.13-11.base.tar.xz 253240 SHA256 d35db3455fc0d01efc9ada22b955c42d0ae724bbf23d109df990ad76bfb545b3 SHA512 a8b063573169a222cdd5771822748372c808e9f88924b5d30746ebcfba588f23edffc6717b0fb4a2bb26346e9c9d9dca761d135090ba40a266ca8a6203ca645a WHIRLPOOL b2f1d18e3e2e0a97c9f7a80327efb4d522d62ae6b5dd934cb62ba9b8a0653008fa75d109aaef3e6825a986901c3d82e73c8cd448121901642aa1e01cd5e0aeed
-DIST genpatches-3.13-12.base.tar.xz 262440 SHA256 8ed8c85ebfac182d0e99f89042377e3820d272f0b2f58755565fb687b84eafb0 SHA512 43ac18b049912a94375c50530960b3a4000119358777799fe0861b94e3b4dcc79adf6f69298f60ebfc68bfc5400c4f2f7e5373eae63332f0b9683b1c4b01f904 WHIRLPOOL 93a641df30b4ac42327ea477c3719d6048f17bca8bf976be8f60771732bea5dd852cc6ca91103f639a74fbd8875c4ef09f249b12d37db002cced63cb88cc59a7
-DIST genpatches-3.13-13.base.tar.xz 284344 SHA256 b74916bf239655bb9fc368e10a3d9d62e6afe8878a9c5dc5f65f712823e80ba0 SHA512 861272348cd8743b6575826e34a01d8bc89cfb5249b24213bb49a0487490a3d240a215534e5b31142ccd98eed8c6c148d1a1b668bff2f070fa449f393346a8fa WHIRLPOOL f72bff2fb3caafe41aab882f17aeb7625c4b9920c5b01cf3a48946fdd20888ae9fe247dcc466cb8b6d7618f3db81a2efa783621bc85c8303cc363b32e154a3f0
 DIST genpatches-3.13-5.base.tar.xz 60572 SHA256 a1be8e79aee0e85dc1c36e863031bfe6e9836ecfdecbd274045e65af09f1cf1d SHA512 5c402a3870e106d0c14732c10b0eec5bf671d1057241a3cd7449620f875f5362ef1747b5748bcd301429e5cbd8995c9438c8e3696f5d3599198c3ebec33a4ad0 WHIRLPOOL 69eb9fd79c4b4d3ba7718582585457045abe12a86f93263706acc385357b139597ea1ada1258e64ccaffc8325e5fe7f91213240695f920ac01f8a1aa9989f1bc
 DIST genpatches-3.13-9.base.tar.xz 193284 SHA256 f507ccb65f1c2cbeee86e4e5949f62db924f5cd9cd35b3962e478802c2279995 SHA512 49540e2c4aae2641a14c27c88888a52358298711d682865ae39128f1d5935325c0bf901cb58ad8d5477940efaee87e5bbd4d758ff4daca88fc23765d8ee176a3 WHIRLPOOL d30fe74184a549493da4fd2ee1b0bd7d75e5439c8387d7d81bc9319926be8706db3e177d5e91b073c988c49a7ff2d2be63854a1e7b43472675844c512daddbc7
-DIST genpatches-3.14-4.base.tar.xz 19028 SHA256 2d6abfa6a7af3f4ad1f46a0b6f121226b08674b2cae272a783cbcc9d20b30e31 SHA512 6885c66e73abb07c55b675cb6a577c2570e19d06ca33fd93857d870d2331177d2f3c7ca99489967f5c7e7b3d4bb808c4cc90b56a8483a6d507e8b2a3198cb636 WHIRLPOOL e093704335fb19bfcf193c000ebe9b119aa42f8c3464fc51c119dc2a8eaae0dfefd9e8f07b98c8aa6cfeba647e18ed1812f1f61ce43907a4c03c9a847967bfb9
 DIST genpatches-3.14-5.base.tar.xz 29832 SHA256 458a678f14d8c9c3beaefe75cc77ce8258346d6096350efffe9de6216017a292 SHA512 525eecbd8bb092bccb071ffbfcb93be4247b973276538a2dcb596ae1a974ad360c5b565e8ea5ef0a05130c4218040ffe73b39491286e4c51b9636b775b974da6 WHIRLPOOL e8a192e467d1b9e26c21531ca621268fb530647069120ef5c79636d0e3783739830a27b97bb9eaa84b1276dd33f44abab66fd11a8ab600a349963ccf90894138
 DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
 DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9 WHIRLPOOL 3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
 DIST hardened-patches-3.11.7-2.extras.tar.bz2 767238 SHA256 908678fe53c768ef564b4c47e00f0e22a7c7c16cc1ea0d931662d19fe6ca7cd8 SHA512 703f8c57931eeced09d3cf77525252b69cb369d8da40c16b8d4521a1b9657ce1075cc4138c5d1678e051575928fab292f59cf2b9638dc538f7d957e4a64dd418 WHIRLPOOL 315b1520631b06ba6ce6683fdbf6a7a3689f278844e2df37879069f2c1d0680c111a6783a4122d96a2d7d4824cdba4e9cf68dce44a1ea5adb1765b55fc67dd7a
-DIST hardened-patches-3.13.10-1.extras.tar.bz2 806948 SHA256 a3eb7bb199370da6139d70489b009e93b2539cd31bf4540d0d4c60f72925020f SHA512 991c190540981bcf34c62ae27ed241ceb41848d479b332c9b1de83b498b86df9bf0d264a6b6e0c252c3460ae3446baf3a92d635027aae5440126be0cfa5c2915 WHIRLPOOL c03fe49f18bf9c735fdb616619c7892d3dfd868f59d2032d58f549b85dce0dcb418a8b0b3fd3fb283ca9a7c348efe2a4d5fcef9cd04b26305dbe185dc4c2e21b
 DIST hardened-patches-3.13.2-4.extras.tar.bz2 795506 SHA256 ecac830959d8a1f5da58477b244d8075983a514eb3c93cf94eff6889967ab7a7 SHA512 87424813f794b2401fdc9b0afa5d1b992eea133674997116747dee98cb8cf6b990debd7cfc6676aee8efcc8c95974e97c2b27362e597a875a68b3b41bce98335 WHIRLPOOL 4f614af739bd8de553a900bb942b6d0430f9d3826ff01d47257600e348c300d77f1141814048ad5bf07f2b5c161d91ddff2a6a0bab9b26b764eb85698fe8292c
 DIST hardened-patches-3.13.6-4.extras.tar.bz2 803157 SHA256 368acbee29c589a53cbc183176f4b1c5818549e9b4d87ebc1d00fd0d650794ed SHA512 584663ab0fd13bc778760c1204591f6b7f25ec19aa1b92fc16ac49da2ff73a1c93f2c6b4967214ac181ac0b2c2490262c1bafd5e5084e8416b9f92963020dbdb WHIRLPOOL 58890b049d258d63e86b0f4fd10c0454fd427f0abdd383540b434d75129e3a4982b407cf3eb1d6b1c0a2959755a64b78ee7f5a954c71a182fb90eb885324b193
-DIST hardened-patches-3.13.8-2.extras.tar.bz2 804301 SHA256 7206a7adc36b83e469a6ddbc9176292b2e9689161de70ac34b58ff206c6c8c7f SHA512 2c1e5c86741c93e148f23bc087b48e6d88749a584b17e3f10a2db0c258ead9e73d190275d73c6348f7ce0957673ad74b743d987c0bf98a8dd5bc50cacf609f90 WHIRLPOOL 450ac2edb73419b5791e12e157cc41015b40a2e53628d5967b615142fb874f3cfb4f1aa3640c7062f24dbc95cb907de46958e75a8d4d4c43dc7f39ceda31799e
-DIST hardened-patches-3.13.8-3.extras.tar.bz2 807445 SHA256 777db11c6cf76275d221ccb80ce87e6e9cf0e96cf35d72ecf57861ee75ea0cf4 SHA512 137f13d8223d88c17132c808746452ffac81d500eb27b552951fe70eb83cf7948c35b2a3698406d77ca0f3b60c8aaf800a76cbeb40429157147da894c9930f19 WHIRLPOOL 1f6264e439ff6abde06176db6a04d2a302331f1c4960ca14d4bc1f4cb8a3efb6e0e081878ab363532cca68e80a14b068c2815977295f819edf145b52d04d5256
-DIST hardened-patches-3.13.9-1.extras.tar.bz2 809347 SHA256 d54f94e4338c2a975525c515ee4676f90f9aa0573090f5dbb804c56a2b1f074c SHA512 7330fe70349a31e00ed466a869cae4d8636fe0b18db89698110c71fb47723539840bd075357838e5b0161956a1640e102a7dc9e8d99128bef68c478b39ecac82 WHIRLPOOL b48fa48c7cc80dbd35beab06522c4e3c9994ab13f5408d5409ae7972ca783353cb6eb6d82fc21a4ad154342eb9b89fd01eaed640f6b22a7a5e8fe5167ade9360
-DIST hardened-patches-3.14.1-1.extras.tar.bz2 809494 SHA256 626c068bdbb6c0fa1330031d493bd25e515066f3dd6100bf7cd13941e1d3f3b5 SHA512 146745eab81e4ec673823b6b28c5a521be87add7bce5ea79043125e1b06addc6c7e4cea260bdbde92e8ae5d454b7344825e09537d97a1fc8bae95c854f476522 WHIRLPOOL f58125a9ac7c613b0fdbde8012f00ddda92fc2a20a544f956912f26cf988e71147a0a5b5038b85121fb96f1eb70147b74019cf6917b143dd71e2794a2a173226
-DIST hardened-patches-3.14.2-1.extras.tar.bz2 810947 SHA256 75ab6564d5640be930a104c2eb924c416b4e11f74de2e327f57363de88a165b3 SHA512 f50664ceeb50c8905b1f17d81ebd88a2d1f9b2b22acc2ef074a02f2800e82ba3c8629b8a2d96ab23da0d0868c9a8e543dc76c9561dc5b2a344ef001e1a8fd181 WHIRLPOOL e5ecfbddd7bba6a41e80916740f04035f3ad846afa57de9d278988eb0ccbda0dc9310a145ee408fe80537d7dff00a67602d729529e9859597afd8f93dd09de82
+DIST hardened-patches-3.14.2-2.extras.tar.bz2 810537 SHA256 2f71f3753f26f5ec6842f57a69add32b8001192083c2db23945458d0c5b90d5c SHA512 8f435194a437b3b48d522f0a5680d5e88bf213d44ffdd333e995571747896555688ebd5aa1865a400d3c3d37df61c9065192ce0a89bb3b3a2bd2866607007d7c WHIRLPOOL 2baadb6f201f14e75f280b082a5060c64c111ae02c58324b38d30b981d8c3ecfc54811368e999bc2dfda106c9ac746edcc2fba6f8884622a40dc70de61f33aa1
 DIST hardened-patches-3.2.53-7.extras.tar.bz2 1691171 SHA256 7dd9b8f06db46488c00b0d5fb1183e8702a11d94101fe9fc44a45afcb6c94803 SHA512 a4890882890c687ba12c3c9fe336301ff4ff9d0b30ddb2e769054e124be45fe2a01e3b6749e6d9e866223507b95eef827ef427cab0effc449af4d5f23890a0d5 WHIRLPOOL 3c45d4ad79146f53d80453f94ebdc30cc25ad4cf1efc49e0efaf9d7fd05e5fb5ae52a42c883503d0939fea6571eee068897fd7a97ea237f17f0e87750a5d44ae
 DIST hardened-patches-3.2.54-10.extras.tar.bz2 1766757 SHA256 362ae7cccee1ad85ac0d134a4e04aa6889372a075e7c5797b2dba5d9bf99ca0b SHA512 0d2c3ad87a4e006de1a8c8b497d88b6fc47c9a24a5e4de930ef8f1ee4f1a3acc9eaac1f63cdbcdf17d71d72bcd8bafb30e60adebfff407a237c7b3622e4841ec WHIRLPOOL ca6efb0876bfda9ef8660a877d8a1c2cf05c01ee7f93fede83bf00b545b8caf018e1a49b623ecfe4b8fa0d549d31ffc4aa6270dadb10f423dcefd119943ed436
 DIST hardened-patches-3.2.55-8.extras.tar.bz2 1798078 SHA256 d7ddc2b8984aa6cd57c5b188fefe60acae2f90ec3a6badbcda899bacd04dc0c2 SHA512 fbdae9dffc1d035a73fa7672734304b06d94e22407f37d9960b549cb6ce864546afb2a50a3f6da36b58eef2eb611d64ccd8e87ff0bb5e5118ecfe6171464331f WHIRLPOOL a1afae9d5b533c6a3c6d3ba2d72c344f17464e2077231f42aa3b2514412df0d6ba98227431fb0d7aa42e2c9e95e34550a74920c590b44a7188dd41ae67c1458d
-DIST hardened-patches-3.2.56-2.extras.tar.bz2 1846924 SHA256 f9e199846a8835307e203536b89dd65eaf67a7c9f12b55dd65ce93fc50c8701a SHA512 e703ff7d5046c84d419e0a9029b5305ebe83d155620d546f4826fa125a9ea16e086502afeaef7dc7dcd474d755c12bf0b08915d8a43367a72a99749d4013ac73 WHIRLPOOL 8c530ac8b507a23df649e6d65f72de1c6e13f40682c0af1f6dbe4b659b641c44293c30dbb1d4f75b09ee1032041936fbe5a1c0e7096ee647b916768bfae5d3c1
-DIST hardened-patches-3.2.56-3.extras.tar.bz2 1852318 SHA256 a937931dcdcfa04e469821409a66fa807d89ffa2429d340417358e8ffc827922 SHA512 b9b3df16acf2beea86880bcc7e92d11122b9279debebce4e44ad28ab719ecbe68d7ce18402a9663220a3bf0e0ac0d8ad1505b67948a54765da6566ddb064c85a WHIRLPOOL 6bc56f6a05aae6632433c8f66c69c88d8892250add4380e7888a33911e0e0da7a2c4890ad52ea3a88bd14d9b8768e625fcff7c84dc72d418144b0c2db2dadb2f
-DIST hardened-patches-3.2.57-1.extras.tar.bz2 1860907 SHA256 0bc81093dce825245ed04bd3d3397dd7ab672dd368347e9cd38cee9093f331e2 SHA512 9fc4469bc3a2c9a02bd4d752d9b1b6ae0e00fb74ca28abc5d163603d3e75c6c7dbbadff8170e57c6978773d88467c5b23996038be3fa1a862225c12a0bc2b393 WHIRLPOOL 10dd039a72ac12750fb2080e8c30bdf0357ca5113c35cf0138ce4cd362ec0232f2734586dc6a27a98426c3a720a2cc905ff01eca0581082b5da90d51def59cf6
-DIST hardened-patches-3.2.57-2.extras.tar.bz2 1868881 SHA256 fc83e5174d2b00fe60ced784256b300214c1f5744cd2b98c27bd747a3cb4a83f SHA512 3cb840785ec92183458b41f1d457d12ab7b618d8132cb44bc44eced43c53406aaa0e9448c59f7b0b54ff51ddbd5f5bc94c34955396dee5db0527037db8f8790a WHIRLPOOL 7313aabe11a9b65c59338d0f5cc3e730ada51b9973c589b8fc57475f2f81d3e03c400735f0c890af3edb65917216a65b2af6dc4ce285e0a685e9da31e5e273c6
-DIST hardened-patches-3.2.57-3.extras.tar.bz2 1848308 SHA256 d79518302f20c392560654921814513cfa79c8da453fc9bd504e9465b8842c25 SHA512 549c7aea208fa11d9fa91d2940aedef17d4daa81a706edccdb04c517b1006b8d76e968b283f86522914a974435195177e0f4d2406741c4c5385c2e13378329be WHIRLPOOL 42fcad51127e537b5a9905cae5cac72d97b9cbd6e9f8a9a42ea922933057ebf10ae02c40fdfb604cbd456b41694741827a33e2957db6fc337b62dfafe7d92944
+DIST hardened-patches-3.2.58-1.extras.tar.bz2 1892888 SHA256 f143d833cf819f45bf9f47abb18665cc139af24965006183e3d6ae2b2a85b9dd SHA512 7075163f5bc807a110b09d2130c10aa99a92d179c8b3dd117f9b5cd55055558c8e5cdbfa19353fb9e8416e60a1d2c3817a6501bbe231b789054e5bb6519952aa WHIRLPOOL ed1dbf56ad9c854b20160659429169b3c70d7574cd3c9a9eedc05f743a277d345958b07f226629be6279ed40515375c0fc6e600877f145acdd9e255e63ac36fc
 DIST linux-3.11.tar.xz 75082460 SHA256 803ec8f0ad4b2ddedcb0332a590cd2b5e10dfc57c3b1c95bc9c46af81d51d7f9 SHA512 b3680d3a45a7308383cf8634a7f1908e94f6e1c6d1cb587332a9418a95fb93bd3c73ab70c6976c7330508d7c8c6b0f43c2a9a2efde5fe1f76e9bfffb1de5686c WHIRLPOOL 96c9c27ffe155fe2c1760b53d87ef981943d58ab2dcf1ed6bd2c1e762e18bceec81d85d49c523947ec6fe52e41f25c4a86310347705c8d4b80a1748cec5b90d3
 DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.13.10.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.13.10.ebuild
deleted file mode 100644
index 90d9ce538eb3..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.13.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.13.10.ebuild,v 1.1 2014/04/19 20:29:21 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="13"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.13.8-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.13.8-r2.ebuild
deleted file mode 100644
index 438365dde3de..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.13.8-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.13.8-r2.ebuild,v 1.1 2014/04/08 18:37:44 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="11"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.13.9.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.13.9.ebuild
deleted file mode 100644
index 2a8c2f35b6ef..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.13.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.13.9.ebuild,v 1.1 2014/04/12 23:17:06 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="12"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.1.ebuild
deleted file mode 100644
index eed9a0c4561f..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.1.ebuild,v 1.1 2014/04/21 18:34:39 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="4"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.13.8-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.2-r1.ebuild
similarity index 93%
rename from sys-kernel/hardened-sources/hardened-sources-3.13.8-r1.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.14.2-r1.ebuild
index 853e65121c0b..1634a494efaf 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.13.8-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.2-r1.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/sys-kernel/hardened-sources/hardened-sources-3.13.8-r1.ebuild,v 1.1 2014/04/04 23:07:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.2-r1.ebuild,v 1.1 2014/05/03 12:41:12 blueness Exp $
 
 EAPI="5"
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="11"
+K_GENPATCHES_VER="5"
 K_DEBLOB_AVAILABLE="1"
 
 inherit kernel-2
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.2.ebuild
deleted file mode 100644
index a58bb8deba31..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.2.ebuild,v 1.1 2014/04/28 12:13:25 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="5"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.56-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.56-r1.ebuild
deleted file mode 100644
index 4caa00a1f3f5..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.56-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.56-r1.ebuild,v 1.1 2014/04/04 23:05:11 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.56-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.56-r2.ebuild
deleted file mode 100644
index 641065be12a2..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.56-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.56-r2.ebuild,v 1.1 2014/04/08 18:36:29 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.57-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.57-r2.ebuild
deleted file mode 100644
index 465ef6d33ff8..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.57-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.57-r2.ebuild,v 1.1 2014/04/27 16:35:22 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.57-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.57-r3.ebuild
deleted file mode 100644
index b44a92e1978e..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.57-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.57-r3.ebuild,v 1.1 2014/04/28 12:12:00 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.57.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.58.ebuild
similarity index 95%
rename from sys-kernel/hardened-sources/hardened-sources-3.2.57.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.2.58.ebuild
index 0a153482c939..a1529a7ee600 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.57.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.57.ebuild,v 1.1 2014/04/12 23:14:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.58.ebuild,v 1.1 2014/05/03 12:37:33 blueness Exp $
 
 EAPI="5"
 
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index 9e106878d801..e2556179b3a4 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -2,3 +2,4 @@ DIST deblob-2.6.32 84094 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2
 DIST deblob-check-2.6.32 247608 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
 DIST linux-2.6.32.tar.xz 52620720 SHA256 723106c298c5ba8733bb51ecc106b05e332a18490edc5f61cc6e57dbb36dcc46 SHA512 f8570daf2806eb191fce54cc7358577b0571bb295a75bd86db630d6136b328ae48e4732554b2d1886c64b0a0018bf0b9105dcface978a5005d1b77789aa40312 WHIRLPOOL bfcb4b186f7c4b60e69674a85d20a8e92b5efd05941b550401ef446cc6b20c9ed197f920d1cd9250c0e518c05308b9225f7ababe41cdfc83570412117b2ee555
 DIST patch-042stab085.20-combined.gz 48295927 SHA256 e95fff298d6f420382d292f0f486bc94eb9d774a694b4bbc160d17eda5e9efe6 SHA512 2652dd743e5bb7297f9d23c063730c46d24c4925deade806f2e8673475718334ff21939eb94848ddf6d901da59c24bc712af1489e49d93c8d776909e4d154494 WHIRLPOOL e1678ff2704a719a3df97e859800480445a157dcd877ee0cf25a398b259538d184bce8df71d2d90b83881142c2e2ac16577a7472fd5cc968750c8ddba04865a7
+DIST patch-042stab088.4-combined.gz 48331720 SHA256 c0d2dab9b3b24e9ada95d7c9c3eb6fd297763edb1dd6bf5455cec0feda49baab SHA512 6f941e74af38928fb5d8436ce68b1a8cee8240f5ac2642267352964cadbd3f289b759981eca25f79d4b57f92f713e8ed9012d8785029165a655e3df21a31f83e WHIRLPOOL afd8865a5deb0434ab918861778f228c9cb83793f9a8fade06c40713c9a85c428d3d6b4cba8ba4b7279923ebcd4814c598ed56b73534916c9ca6613db1bace3a
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.88.4.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.88.4.ebuild
new file mode 100644
index 000000000000..057cd3daa48d
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.88.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.32.88.4.ebuild,v 1.1 2014/05/03 11:01:11 civil Exp $
+
+EAPI="5"
+
+inherit versionator
+
+OVZ_KV="0$(get_version_component_range 4).$(get_version_component_range 5)"
+
+CKV=$(get_version_component_range 1-3)
+OKV=${OKV:-${CKV}}
+EXTRAVERSION=-${PN/-*}-${OVZ_KV}
+ETYPE="sources"
+KV_FULL=${CKV}${EXTRAVERSION}
+if [[ ${PR} != "r0" ]]; then
+	KV_FULL+=-${PR}
+	EXTRAVERSION+=-${PR}
+fi
+S=${WORKDIR}/linux-${KV_FULL}
+
+# ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
+KV_MAJOR=$(get_version_component_range 1 ${OKV})
+KV_MINOR=$(get_version_component_range 2 ${OKV})
+KV_PATCH=$(get_version_component_range 3 ${OKV})
+
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.xz"
+
+inherit kernel-2
+#detect_version
+
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DESCRIPTION="Kernel sources with OpenVZ patchset"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://download.openvz.org/kernel/branches/rhel6-${CKV}/042stab${OVZ_KV}/patches/patch-042stab${OVZ_KV}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-042stab${OVZ_KV}-combined.gz"
+
+K_EXTRAEINFO="This openvz kernel uses RHEL6 patchset instead of vanilla kernel.
+This patchset considered to be more stable and security supported by upstream,
+but for us RHEL6 patchset is very fragile and fails to build in many
+configurations so if you have problems use config files from openvz team
+http://wiki.openvz.org/Download/kernel/rhel6/042stab${OVZ_KV}"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 767003032bb6..d09bd1a83d34 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -20,5 +20,5 @@ DIST patch-3.10.38.xz 654412 SHA256 c1e4a92e06c6bc35c643fa433f484810e52895796d31
 DIST patch-3.12.18.xz 473392 SHA256 00dc663689caaf74e8223e114eb37a651876ce3e03e42248b625383737243c56 SHA512 74756ea0bff326a631005997c237c2b95135a658bf610c68c1abfd451560d7400d1589eabbaa9769a3552d1f0e644b291d7dab984cd8b565d8c74a68ea0d88a4 WHIRLPOOL cedf95805db0d0e9eaeaddc55724c9d6619190446b40d04b5b4e28079797ca40d6d06946a3f21997e248fad6598aebffc3e9863e6693a2a17f5662b65b5e34c5
 DIST patch-3.13.11.xz 278568 SHA256 0c481b0abee4ba6779fe168f98dcca6481a033d393d66ff6b9caaed7f0307231 SHA512 31a85e07ed75f68507d4d264d36314877c6304f4c9afb18173d70255c1c5514772989bcbc3582756e57c22d28dc84a610acc56edbb6d06045d9c63505fcfbc1b WHIRLPOOL 814ca09d577a8fd0ccb2a41353aebb93f18209b2b3c51a2b5c76353cb474ea58ba88be805d4e0d316eb0442b9ee50637ac9d25a05fa0b4a8453cdea8273aa50b
 DIST patch-3.14.2.xz 22732 SHA256 1c7a8fee1674bfa6354dc6e3038ca1f16bc1327b035cd4896b795b482c7d1829 SHA512 72132895aa04bd3e029a490cdf6f6363f672562517afafb6c7b982e2a56b989de3684b7a59df830757025b37bfdb458b26deea03ee4ec1f7e379b97934670988 WHIRLPOOL d6d563e8835ec6ce5f5626fc1310df9e439873b5dfba53ddc61f7958e109f982277f5fe78d2871794fb74ca2f67555c08f8fe5f5394586c03314aebd256fb7a2
-DIST patch-3.2.57.xz 1140460 SHA256 397ab3d70d3f1b1cb2d249b901624a7d6ea300fd4404bdb04c0a97d9db9b5f09 SHA512 6b59432278ceb46e78bfb6c5516c25b4b9c1a63c02f0aae63e4cfe9058ed868ef1a6beda226aedad1a11bed81d9d5a6322f6163bd4ad4fcca8d3f27745dc7a3b WHIRLPOOL 362a31ad373f300c78e490548e3fe31a4723cb6ca094378853f040263c27fac7bf0e363dfde9fb70c2bda233f3a8310f4cab142358b6c0968fdcdcf96988f877
+DIST patch-3.2.58.xz 1161876 SHA256 6205e2f1934f9cdae100cc5641a7b1e487bba451348b2b586f9648d4b810dbc5 SHA512 0bf0c5d589928664e2dac1df7f9518975e3b871929161258d42dbd7733b9f238ec7d1a61e206aa5a379c6dcf013452dd3ab0603428a67b35b014b12432f3b3dc WHIRLPOOL 9af776b90a30a4bf096619ff3fab9bd8ed1b4e5ef0b07519bc7653c0b7b935c55563d6d9d8112dbd55efbc3804938f79420c2f6a854fe130de610cabe78a25fa
 DIST patch-3.4.88.xz 969888 SHA256 3fe70dfbff8c47664c5f9d6cf93235dbbb541bf8918201c5c49f6d74e1162877 SHA512 adb21eefa483c0be430e86be57f522faa7981f4e4b801b710bda7269d63ab3089c07266d9b09cf107f158e100405ff7f00202e48ecfb88091202a84a95b5f954 WHIRLPOOL 2b62ddae4cb7003f29a5177ebd24456d3d9d2e30b7dad928be63f1e9d181b907a8d7053ba7d03c55d50572f499454b9f8d1839fe38070bb8a57363646419fdca
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.57.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.58.ebuild
similarity index 88%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.2.57.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.2.58.ebuild
index aad58557548b..edd8ba07ac52 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.2.57.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.2.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.2.57.ebuild,v 1.1 2014/04/11 18:23:58 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.2.58.ebuild,v 1.1 2014/05/04 07:55:50 ago Exp $
 
 EAPI="5"
 K_NOUSENAME="yes"
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index d12919fd2e19..ce3f8d98bd55 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,2 +1,2 @@
-DIST htop-1.0.1.tar.gz 384683 SHA256 07db2cbe02835f9e186b9610ecc3beca330a5c9beadb3b6069dd0a10561506f2 SHA512 9cc442fd63fb3270929e489f645d1a63fdcba2bee4ea0e606a86257badb55fa02794b7a97de4070c951f5558b7d40a677e10801a1c42c0832521a453f956997c WHIRLPOOL 4091088071cc247fead93df788a5ecb64ce32d026e4119276acce7a91a5061561700dbb26236b17ea51b399829b60654e059ca3124f74892ab507efae370053b
 DIST htop-1.0.2.tar.gz 388499 SHA256 ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1 SHA512 50ae0e8ace862520c01a707b3cf9a19591dc1081f6fc38c7fdccc81e36dd94b3cbe9db00cbb90f782c22d9b73f22526e24d04fad8368c6f2a7de0c58f9d92191 WHIRLPOOL 2766cfe1ea9c98d23c375e5a1c293c6d573d33cf7132e9aaa6ad0335a5f62976a8b8a8da6ede2f03bbadb31ac62e9d7ba5b35138a262dda73eb033afdf27b570
+DIST htop-1.0.3.tar.gz 399306 SHA256 055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232 WHIRLPOOL 14b8879210025aff9a1e098314a1b35d2bb6fcfaab42b95670e3726c61d471b1618486e6fc3dbbc97043e85f9a22196d97e676f3b2dd98250326be8527bdebbe
diff --git a/sys-process/htop/htop-1.0.1-r1.ebuild b/sys-process/htop/htop-1.0.1-r1.ebuild
deleted file mode 100644
index f7456d7f3f6c..000000000000
--- a/sys-process/htop/htop-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.1-r1.ebuild,v 1.7 2014/02/03 16:43:30 jlec Exp $
-
-EAPI=4
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-pkg_setup() {
-	if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
-		echo
-		eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function."
-		eerror "To mount it, type:"
-		[ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc"
-		eerror "mount -t linprocfs none /compat/linux/proc"
-		eerror "Alternatively, place this information into /etc/fstab"
-		echo
-		die "htop needs /compat/linux/proc mounted"
-	fi
-
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-}
-
-src_prepare() {
-	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
-		scripts/MakeHeader.py || die
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	myconf=''
-
-	use kernel_FreeBSD && myconf="${myconf} --with-proc=/compat/linux/proc"
-
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats \
-		${myconf}
-}
diff --git a/sys-process/htop/htop-1.0.1.ebuild b/sys-process/htop/htop-1.0.1.ebuild
deleted file mode 100644
index fca7081c5592..000000000000
--- a/sys-process/htop/htop-1.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.1.ebuild,v 1.12 2014/02/03 16:43:30 jlec Exp $
-
-EAPI=4
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="elibc_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-pkg_setup() {
-	if use elibc_FreeBSD && ! [[ -f "${ROOT}/proc/stat" && -f "${ROOT}/proc/meminfo" ]]; then
-		echo
-		eerror "htop needs /proc mounted to compile and work, to mount it type"
-		eerror "mount -t linprocfs none /proc"
-		eerror "or uncomment the example in /etc/fstab"
-		echo
-		die "htop needs /proc mounted"
-	fi
-
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-}
-
-src_prepare() {
-	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
-		scripts/MakeHeader.py || die
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats
-}
diff --git a/sys-process/htop/htop-1.0.2-r1.ebuild b/sys-process/htop/htop-1.0.3.ebuild
similarity index 55%
rename from sys-process/htop/htop-1.0.2-r1.ebuild
rename to sys-process/htop/htop-1.0.3.ebuild
index 6295a3abbd4d..ac68b51452e6 100644
--- a/sys-process/htop/htop-1.0.2-r1.ebuild
+++ b/sys-process/htop/htop-1.0.3.ebuild
@@ -1,25 +1,34 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.2-r1.ebuild,v 1.2 2014/02/03 16:43:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.3.ebuild,v 1.1 2014/05/02 23:05:38 idl0r Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools eutils
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils linux-info python-any-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://hisham.hm/htop/"
+SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+IUSE="kernel_FreeBSD kernel_linux oom openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses[unicode?]"
 DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog README )
 
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+# config.h problems
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 pkg_setup() {
 	if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
 		echo
@@ -36,28 +45,35 @@ pkg_setup() {
 		ewarn "To use lsof features in htop(what processes are accessing"
 		ewarn "what files), you must have sys-process/lsof installed."
 	fi
+
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
 }
 
 src_prepare() {
 	rm missing || die
-	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
-		scripts/MakeHeader.py || die
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
+
+	sed \
+		-e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
+		-i scripts/MakeHeader.py || die
+
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
 
-	local myconf=''
+	local myeconfargs=()
 
-	use kernel_FreeBSD && myconf="${myconf} --with-proc=/compat/linux/proc"
+	use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc )
 
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats \
-		${myconf}
+	myeconfargs+=(
+		$(use_enable openvz)
+		$(use_enable kernel_linux cgroup)
+		$(use_enable vserver)
+		$(use_enable unicode)
+		$(use_enable oom)
+		--enable-taskstats
+		)
+	autotools-utils_src_configure
 }
diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml
index cb2b58bcfb07..1cc6802ab8d2 100644
--- a/sys-process/htop/metadata.xml
+++ b/sys-process/htop/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>idl0r@gentoo.org</email>
-    <name>Christian Ruppert</name>
-  </maintainer>
-  <use>
-    <flag name="openvz">Enable openvz support</flag>
-    <flag name="vserver">Enable vserver support</flag>
-  </use>
-  <longdescription>
+	<maintainer>
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<use>
+		<flag name="oom">Add column to track the OOM-killer score of processes</flag>
+		<flag name="openvz">Enable openvz support</flag>
+		<flag name="vserver">Enable vserver support</flag>
+	</use>
+	<longdescription>
 htop is an interactive process viewer for Linux. It aims to be a 'better top':
 you can scroll the process list vertically and horizontally, and select a
 process to be killed with the arrow keys instead of by typing its process id.
diff --git a/www-apache/mod_ruby/Manifest b/www-apache/mod_ruby/Manifest
deleted file mode 100644
index be14e28b173b..000000000000
--- a/www-apache/mod_ruby/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_ruby-1.3.0.tar.gz 114246 SHA256 6c82120ddc20d87f2bf066f60899eb71cd7791f03526084f942d050432c9411e SHA512 439c0c84c6f7caebb43ddf21c25843fd74858bcea907946cbe6ff3577cc804cfbb1b149b6f0dc323a5a62c57d969e4210e919ebf97738ee1b306cbfbea756220 WHIRLPOOL 69d8f4cb44925ad9ac2798cd9f577784b22a646409f5c624eaa90e11532f3b4805691e3e2857e1893abb099a2fda4fe6d98ea189f662bbdc0162c61a3a2ddef8
diff --git a/www-apache/mod_ruby/files/21_mod_ruby.conf b/www-apache/mod_ruby/files/21_mod_ruby.conf
deleted file mode 100644
index 12aa8f0fa3ef..000000000000
--- a/www-apache/mod_ruby/files/21_mod_ruby.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-<IfDefine RUBY>
-LoadModule ruby_module modules/mod_ruby.so
-
-# taken from the example file
-# If the ruby module is installed, this will be enabled.
-# for Apache::RubyRun
-RubyRequire apache/ruby-run
-
-# exec files under /ruby as ruby scripts.
-<Location /ruby>
-	SetHandler ruby-object
-	RubyHandler Apache::RubyRun.instance
-	Options ExecCGI
-</Location>
-
-# exec *.rbx as ruby scripts.
-<Files *.rbx>
-	SetHandler ruby-object
-	RubyHandler Apache::RubyRun.instance
-</Files>
-
-# for Apache::ERubyRun
-#RubyRequire apache/eruby-run
-
-# handle files under /eruby as eRuby files by eruby.
-#<Location /eruby>
-#	SetHandler ruby-object
-#	RubyHandler Apache::ERubyRun.instance
-#	Options ExecCGI
-#</Location>
-
-# handle *.rhtml as eruby files.
-#<Files *.rhtml>
-#	SetHandler ruby-object
-#	RubyHandler Apache::ERubyRun.instance
-#</Files>
-
-# for Apache::ERbRun
-#RubyRequire apache/erb-run
-
-# handle files under /erb as eRuby files by ERb.
-#<Location /erb>
-#	SetHandler ruby-object
-#	RubyHandler Apache::ERbRun.instance
-#	Options ExecCGI
-#</Location>
-
-# for debug
-#RubyRequire auto-reload
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_ruby/mod_ruby-1.3.0.ebuild b/www-apache/mod_ruby/mod_ruby-1.3.0.ebuild
deleted file mode 100644
index d89a9d900740..000000000000
--- a/www-apache/mod_ruby/mod_ruby-1.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ruby/mod_ruby-1.3.0.ebuild,v 1.8 2012/10/16 15:15:51 graaff Exp $
-
-EAPI=1
-
-inherit apache-module
-
-DESCRIPTION="Embeds the Ruby interpreter into Apache."
-HOMEPAGE="http://modruby.net/"
-SRC_URI="http://modruby.net/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="dev-lang/ruby:1.8"
-DEPEND="${RDEPEND}
-	doc? ( dev-ruby/rdtool )"
-
-APACHE2_MOD_CONF="21_mod_ruby"
-APACHE2_MOD_DEFINE="RUBY"
-APACHE2_MOD_FILE="${PN}.so"
-
-DOCFILES="ChangeLog COPYING README.*"
-
-need_apache2_2
-
-src_compile() {
-	ruby18 configure.rb \
-		--with-apxs=${APXS} \
-		--with-apr-includes=$(/usr/bin/apr-1-config --includedir)
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd doc
-		emake || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc ; then
-		dohtml doc/*.css doc/*.html
-	fi
-
-	apache-module_src_install
-}
diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest
index b8c04c888120..cc10d21faf62 100644
--- a/www-apps/guacamole/Manifest
+++ b/www-apps/guacamole/Manifest
@@ -1,3 +1,6 @@
 DIST guacamole-auth-ldap-0.8.0.tar.gz 382872 SHA256 745e7541ab5db9decb463a7358e17c13cab5843d8458e0bf04f5a8eda8f19064 SHA512 2e775de3757b0e161fd7c6ac19982763bbafec42fef3418cb469cf3cb6bf1783b01486fe28e5a250af7b67107a5c3c73e2ad2b10a4e49b3ca187e76e2b578776 WHIRLPOOL df9a926df2f2a095a816234b6499640149e81acb4b6610d94ff8588e28ae9eaace8c0ca1808d1522aa55531674c53cbc6b5f55f606d7af73918610c9eb095ecf
+DIST guacamole-auth-ldap-0.9.0.tar.gz 382885 SHA256 b9e0440202a4106b6fd0a8cdd9da7bfa476895ce8724edc7d75e80b89bca9780 SHA512 caf228029a4e69ac1ac1f252c761167c1676eadbb362877753710aa28d274f76ed8091102f5a142b871dc7a7e22f98d113c18fa06e46dfbf6ec57c3ea92b435b WHIRLPOOL 3f674c98c6c0bf068426f3c78947f1f09fecc19d55a341b58f9adde8920bc30722077feed7f293d082009991bc08ab8cbddba2569a65e05fcc39b8a91f5f875f
 DIST guacamole-auth-mysql-0.8.2.tar.gz 2101795 SHA256 26902d50237a5bcb65b5dc9e31e7c51d6318614b97200c58c030a655e57aed82 SHA512 9bc5e7a5750d52a3df288088fa331f9e442cea06abf704df3989e714daba03e20b07ff5c531b4966ccc2f50c49124b9b7819447330d3be9ac5cce79c368663c6 WHIRLPOOL bce4711ca03315feb770cd82f07b4370ea8ff74ca38a952827b36428150ee31c3e6deaf633fd7e256047ccf9e361e80b2d46248e5f2f6c3f896363b2e2badd13
+DIST guacamole-auth-mysql-0.9.0.tar.gz 2104231 SHA256 5419d62a8decae579b54773ed70c8f21b03c11a53c24de982e8f84a79d74423e SHA512 00cc09e75f8c977a2465759b97022007fe34ba9272f9b9004eec404419a68b8c0b301fc385b4f09af07bde82510a6f5b808585c78a61b26cabd98529a5b1c4fa WHIRLPOOL cacb8ee6387b43b0c4fd5c473680404828acc8cbdee219930043ef2f18857ca53b1502e8a650f0cbc6a4a2dfbb42d457991043a4823445e261eb2dc53aad9601
 DIST guacamole-client-0.8.3.tar.gz 345097 SHA256 a2e3d96b9f83308caf35068d657882fff9c3977533bb3b125cda1971422112ce SHA512 395ffbb08b877e4af538b1d0859d8e28e3352f2fe41482e7790c9b3c7597f37882ca032d383c7994d5f2e193404c5c267cdf793d642fb551e04465edfe93d7f0 WHIRLPOOL 19a778b40b7220604a7c5ecd93fa8a7680b7efadf304ffb5b747dad52bbf6dffdeed5a16c26cdd3773b6a0a155b7ba23a76b3233bdd2d658c0dc71a4a86ada80
+DIST guacamole-client-0.9.0.tar.gz 314566 SHA256 2f98776e542fccdeb3a120ae266834e56935a30196d0c3088a8fa523a07f3594 SHA512 33dd583cde9188066f0254fe9a531886be79110ef9f0e62fc60771d2751a927f783eb484e5484760e4ed3bc2aaa1f2000f43f953b78122cbdc2b0f19d8141457 WHIRLPOOL 972ea5c2bfe7f7dc2b1cc42ca6bc49485c18e46b161180e6eddf828467dcce76cae58f89ca0a4e847ab33ebb0ee2ffa87b052c94a9707d8b1538cc3f1ac29c20
diff --git a/www-apps/guacamole/guacamole-0.9.0.ebuild b/www-apps/guacamole/guacamole-0.9.0.ebuild
new file mode 100644
index 000000000000..30020a09768b
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.9.0.ebuild,v 1.1 2014/05/03 12:09:01 nativemad Exp $
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guacamole.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
+	mysql? ( http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.9.0.tar.gz )
+	ldap? ( http://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.9.0.tar.gz )"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="AGPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86"
+
+IUSE="ldap mysql"
+
+DEPEND="dev-java/maven-bin"
+
+RDEPEND="${DEPEND}
+	www-servers/tomcat
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	if use mysql; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
+		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
+		elog "-"
+	fi
+	if use ldap; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-ldap-0.9.0/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-auth-ldap-0.9.0/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-0.9.0/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	fi
+	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/${PN}/doc/example/${PN}.properties" || die "properties sed failed"
+	insinto /etc/"${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	doins "${S}/${PN}/doc/example/user-mapping.xml"
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "Please unpack /var/lib/"${PN}"/"${PN}".war in to your servlet container! If it is an update,"
+	elog "delete the old content first!"
+	elog "Read: if you use the command below, delete everything within /var/lib/guacamole/guacamole first!"
+	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
+	elog "like this:"
+	elog "cd /var/lib/guacamole && mkdir guacamole && cd guacamole && jar -xvf ../guacamole.war && cd .. && mv guacamole /var/lib/tomcat-7/webapps/"
+	elog "ln -sf /etc/guacamole/guacamole.properties /usr/share/tomcat-7/lib/"
+	elog "You will also need to define users and connections in /etc/guacamole/user-mapping.xml if mysql is not used!"
+}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 34abdb6ffd03..0f81a76edc89 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,12 +1,10 @@
 DIST chromium-34.0.1847.132-testdata.tar.xz 108476892 SHA256 0c3c9894cd1a16bfcfc122d40d38bf1c6986087e17d22d86de9d3624c404eb32 SHA512 db8ca16ded7cde02cb257fc30bc0badd0aed30439f656c868bcdbef15cdc651d1ac623418ee0544ed73b8f55784011e0b159edd16e84fa904323cbde9dfed4da WHIRLPOOL 5eee1d121f02f49ddde826114c3edc5aeebd00cfaad35d58cb05507d32a3524b32d06722d47a7d40343b1aee1e7a6599c9b737029dbc4c39e563d9176f5bed45
 DIST chromium-34.0.1847.132.tar.xz 190164176 SHA256 e8930a43d2cff3cd98d4772f6b7a527b363fa9567afbe86a4c0574dc25886038 SHA512 49d51545548f51dfd917d3980c11b99d45ec68622f282a13346b5658674316ed6da96ca6903ed9e7b9fa7f1c90eac7a3d4766bf36cb8da52e03605771cb9c368 WHIRLPOOL da0c0da7b4e171fac31d3a9854e54b4fb845091696b9303b24d2fc614d1e8c61d39aba17cc32f9ba3364d8e41aabf4985ad73c17764fc3a155b78a4a526fff69
-DIST chromium-35.0.1916.47-testdata.tar.xz 109107096 SHA256 2bcdbbcede804266a46a53844c289c7c901893d8ef966cdb9c0a080406c6666f SHA512 f493992497810902dce8fb273b8a9222e6dd2b37b9bbdfa5529475e48b893b5d2b70bdff71aa5adbc5c9bf4365d685ac73a1ecc551647fbab24dc2702ddfb6f4 WHIRLPOOL 3ea99f80111539b30860c23a66f48d325adb5dcbc0223eb91cc1d5c27cad97e5a5e158ebd37ef8f9ac0333e26547df958e109defc444217d121b6c9a6dafa69c
-DIST chromium-35.0.1916.47.tar.xz 206217416 SHA256 90154389a49bd5acb025849d1a7fd66b16992f3d690be0f4bb4459b7bc3a085f SHA512 89b4a6c9218f3d3174b544eadf670647627c9c1d551185e662061fec0dcd00fa608ff10a7ec5891d6ad8a6c648febeabbe3ebbb641c50aea741d594d01bf83d5 WHIRLPOOL f64b78fe26c9d558cd416662ea32740aa7a38f45d05bfbcd64f56b31a857fbd85e6cc1fb24fed4c34ed0fc9aa1a4e72154323ec488fab6dc9c9e4516d5c89410
 DIST chromium-35.0.1916.69-testdata.tar.xz 109110744 SHA256 0be9d3d686ac819dfaa93cfd6ad4f94b0e41aeafcc1fca24570e6b50b9767b59 SHA512 a1c868b628571fb7902157057384d8a195bcf83491e3d77f984eb85671869a8989e64ecf818c4501bc1010d95d6420de09d807d23e71165c629cdcbe8ec12b76 WHIRLPOOL 7905131b8b195947e23bfb6684705af9712d495c3ad9f4626bd85247b5ca32a49590275000698f509831117dfc2be93864df0e6ff041edef4af5149ef197435e
 DIST chromium-35.0.1916.69.tar.xz 206229124 SHA256 a45a1fce3359fff09f7e35e64eea9d28f72e637ca9c6fb22cf19bf1b019a6474 SHA512 cb416ce598707acbaba53d39d19dd84a4cb7d4e8b88f1faf31c6af53e4b343839af8098bdddb3ff3cb791d3e874ab417e92cff6a1fa960471452829abf36fa58 WHIRLPOOL 0ae27d679478a496352e146868a985761f9c45e289c447dc0b5de527e33df9ec0ce791227bad2fe76b033425ffb6deb77b5f18c80e8622a9cc8f746b13b8aa3b
 DIST chromium-35.0.1916.86-testdata.tar.xz 109105432 SHA256 0e04fe0b985848c6669628940aa3733ec73e80379847da837d49683bc89521ec SHA512 8507125ff41de6d6fa56e227b0e5c99f6e044c32ea5de193729d13b119c792f81e4e11a54844c67c73631e1ca4539f8af96b850d8ba6d8b30f1429b8e816e57d WHIRLPOOL ddb2aea06cf8c4bc8286f0d72b510f27249bfe2f7bf6ea6a93a3ecfdd0022aa7cc528d6b4c39ee930527741ecf1710310e81ea1b6996da45874b884e8e21eb02
 DIST chromium-35.0.1916.86.tar.xz 206227908 SHA256 4fe4535936f8e7102263743ac02b97e2b10bb41cbadf02a6230147875cbc4f5e SHA512 aae758b6343abafbe5c0f5025f34d167d7eddcaadd62bb6e5d25f092ddd8428eef7b7aa53dcf07cd984a5ef54cf966d846bbac21c7e30c6d2aa2e65397021510 WHIRLPOOL 98f7f958c0c510107c2d6d209e22da560ef88fe0d058f506cb8a600fd66dcbd0f3ec575ec13ad0b41f69e09048ddfa6dbad5b2cf9dccaf08ccc274dc50f1b8f9
-DIST chromium-36.0.1941.0-testdata.tar.xz 109180096 SHA256 4007f36ee0442cee4757ee192a4faf4058e79728332af9cb14ed995f7974d4e4 SHA512 c1ec3a0f774f8918ce6b4ae75e2eafe461322876b67566761ac28251b99fe248ba0fc9d46e6b169843bb0aef91800ee6897bb144fd3a2d83a69383ad0a814b0a WHIRLPOOL 4f757e0939db5ce43b1d231fc438d8c18777872721fce724db815fa33f1a2b5a050f95115a01d641f112fcd9059645e1f5376e1868301d1fef65167aa24d26fd
-DIST chromium-36.0.1941.0.tar.xz 204959420 SHA256 fa3a7d5d9fe2a946139d023403584a6fa94f7f57028633c6428c470a11f6308b SHA512 15e5f8866be2963bf647f75fd25222d0e1bcb0980ad997210990cf5b02beaffc8b471994d2bb6a38f983e788e16ab60582522c55dd813ceccaae62981da754d6 WHIRLPOOL 0fd4f12956911239f87f4b3ca924987b36b018d45d5c8e3405a2738ea078243a352108e62b9364e7dc236621a1969ea6a0678d3535038f2a41d172e3b397aefa
 DIST chromium-36.0.1951.5-testdata.tar.xz 109475948 SHA256 9511e8352fb851ff61637ae8a606614aee2e0a88c293398ba94942cf4155d95a SHA512 a0394a64485e8a2966f20a56571a9ca4971e67aeec76121b46b73359aedb2065d812ad2f2be0ca91b08d1dd0d54454f192591e6bfd78c244b7eb02699a8f251b WHIRLPOOL a8031d428465e10c1194d716a6f40c514213c9716a745176055d9d2417410aec08dfb26e8dd5bfad9f9dc4add79d29cc7303f761e78502d41c658dabd2262e37
 DIST chromium-36.0.1951.5.tar.xz 204855580 SHA256 94d4e62d66c150ea948d7dc120fa31a2f9b3e1390c92f2a874d603e7640d22cc SHA512 3462ea90e46d463f16f11b028aaa23ad13358c29cc3ffcf8e26859346cc096740b60af594e8a0dc8a2dc7859790d1ae791f84cc4a57cc1ede77429c59d904fde WHIRLPOOL 9bc48c217800c7a14b86bac6cdaee013367f291ba812e3ef8d1eb175b6d53f52472632d5674ece558e69b504b3c96ced18925b301b5e158fe481ec4071e3a63c
+DIST chromium-36.0.1964.2-testdata.tar.xz 111475684 SHA256 33518af5ca28d914bb85c7e2df46b032e9eb72989467e9d8dcc0fb95a1587577 SHA512 e3d9a66eacc9dfd0153348ab3ddbf2195314808af7d9d1b1a53265a99566f06f4a62eef444e6fc3bffb6e883c356c97f71dad03364298e2446e6f10328bc3667 WHIRLPOOL 7e5e6064bb6290e1adb7605ef5a258fa3bbf76f77f7c290cc2986aed98f31ea45c1d6d45f117047b304ca5155c973d839559fe016ed203a6508a1b912a23a8ca
+DIST chromium-36.0.1964.2.tar.xz 204717104 SHA256 8cbc55791c670e674653bf087673cfd9c17e4417d0cd5b200803d03b4a09377b SHA512 e4c01dd92aedccffe4b243187bfeb2c09ff2d1d39c8fd8ea52be6dc69af9daec3b889bf7adc440188e4289b86cd67a358f6e95c2f4aa89aeb120b9a804faffb7 WHIRLPOOL 878f0413ffa8e2311152212f92f950dd19e2211e2d12e4d86b498633adc7090bd88ae4178bce2c540867c3bdc8f836a2bfe1a9fa6fd5de0c55bfbeec3d24d5d3
diff --git a/www-client/chromium/chromium-35.0.1916.47.ebuild b/www-client/chromium/chromium-35.0.1916.47.ebuild
deleted file mode 100644
index 226e81a3dc17..000000000000
--- a/www-client/chromium/chromium-35.0.1916.47.ebuild
+++ /dev/null
@@ -1,658 +0,0 @@
-# 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-35.0.1916.47.ebuild,v 1.2 2014/04/18 13:11:19 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-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.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? (
-		dev-libs/libgcrypt:0=
-		>=net-print/cups-1.3.11:=
-	)
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	>=dev-libs/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/gnome-keyring-2.28.2:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/harfbuzz:=[icu(+)]
-	>=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/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 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	test? (
-		dev-libs/openssl:0
-	)"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	x11-misc/xdg-utils
-	virtual/ttf-fonts
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
-')"
-python_check_deps() {
-	has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
-		{ ! use test || has_version "dev-python/pyftpdlib[${PYTHON_USEDEP}]"; }
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-base/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/angle' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/cld' \
-		'third_party/cros_system_api' \
-		'third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/flot' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/icu' \
-		'third_party/jinja2' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsrtp' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libwebm' \
-		'third_party/libxml/chromium' \
-		'third_party/libXNVCtrl' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/markupsafe' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/nss.isolate' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/polymer' \
-		'third_party/ply' \
-		'third_party/protobuf' \
-		'third_party/pywebsocket' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/tlslite' \
-		'third_party/trace-viewer' \
-		'third_party/undoview' \
-		'third_party/usrsctp' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_icu (resolve startup crash).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libvpx (http://crbug.com/347823).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #503084).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_openssl=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc linux_use_tcmalloc)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	myconf+="
-		-Dlinux_use_gold_binary=0
-		-Dlinux_use_gold_flags=0"
-
-	# TODO: enable mojo after fixing compile failures.
-	myconf+=" -Duse_mojo=0"
-
-	# Always support proprietary codecs.
-	myconf+=" -Dproprietary_codecs=1"
-
-	# Set python version and libdir so that python_arch.sh can find libpython.
-	# Bug 492864.
-	myconf+="
-		-Dpython_ver=${EPYTHON#python}
-		-Dsystem_libdir=$(get_libdir)"
-
-	if ! use bindist; then
-		# Enable H.264 support in bundled ffmpeg.
-		myconf+=" -Dffmpeg_branding=Chrome"
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -m 755 "${TMPDIR}" || die
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.sh linux ${ffmpeg_target_arch} "${PWD}" config-only || die
-	chromium/scripts/copy_config.sh || die
-	popd > /dev/null || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	# TODO: add media_unittests after fixing compile (bug #462546).
-	local test_targets=""
-	for x in base cacheinvalidation content crypto \
-		gpu net printing sql; do
-		test_targets+=" ${x}_unittests"
-	done
-
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-	if use test; then
-		ninja_targets+=" $test_targets"
-	fi
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot.${target_arch} || die
-	pax-mark m out/Release/mksnapshot.${target_arch}
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-	if use test; then
-		for x in $test_targets; do
-			pax-mark m out/Release/${x}
-		done
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local LC_ALL="en_US.utf8"
-
-	if ! locale -a | grep -q "${LC_ALL}"; then
-		eerror "${PN} requires ${LC_ALL} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${LC_ALL} is not supported"
-	fi
-
-	# If we have the right locale, export it to the environment
-	export LC_ALL
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# virtualmake dies on failure, so we run our tests in a function
-	VIRTUALX_COMMAND="chromium_test" virtualmake
-}
-
-chromium_test() {
-	# Keep track of the cumulative exit status for all tests
-	local exitstatus=0
-
-	runtest() {
-		local cmd=$1
-		shift
-		local IFS=:
-		set -- "${cmd}" --test-launcher-bot-mode "--gtest_filter=-$*"
-		einfo "$@"
-		"$@"
-		local st=$?
-		(( st )) && eerror "${cmd} failed"
-		(( exitstatus |= st ))
-	}
-
-	local excluded_base_unittests=(
-		"OutOfMemoryDeathTest.ViaSharedLibraries" # bug #497512
-	)
-	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
-	runtest out/Release/cacheinvalidation_unittests
-
-	local excluded_content_unittests=(
-		"RendererDateTimePickerTest.*" # bug #465452
-	)
-	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
-
-	runtest out/Release/crypto_unittests
-	runtest out/Release/gpu_unittests
-
-	# TODO: add media_unittests after fixing compile (bug #462546).
-	# runtest out/Release/media_unittests
-
-	local excluded_net_unittests=(
-		"NetUtilTest.IDNToUnicode*" # bug 361885
-		"NetUtilTest.FormatUrl*" # see above
-		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
-		"SpdyFramerTests/SpdyFramerTest.CreateContinuationCompressed/2" # see above
-		"HostResolverImplTest.BypassCache" # bug #498304
-		"HostResolverImplTest.FlushCacheOnIPAddressChange" # bug #481812
-		"HostResolverImplTest.ResolveFromCache" # see above
-		"ProxyResolverV8TracingTest.*" # see above
-		"SSLClientSocketTest.ConnectMismatched" # see above
-		"UDPSocketTest.*" # see above
-		"*EndToEndTest*" # see above
-		"Version/QuicHttpStreamTest.Priority/0" # bug #503010
-		"Version/QuicHttpStreamTest.DestroyedEarly/0" # see above
-	)
-	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
-
-	runtest out/Release/printing_unittests
-	runtest out/Release/sql_unittests
-
-	return ${exitstatus}
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/icudtl.dat || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-36.0.1941.0.ebuild b/www-client/chromium/chromium-36.0.1964.2.ebuild
similarity index 99%
rename from www-client/chromium/chromium-36.0.1941.0.ebuild
rename to www-client/chromium/chromium-36.0.1964.2.ebuild
index 61faf114c503..5aeea97f04e0 100644
--- a/www-client/chromium/chromium-36.0.1941.0.ebuild
+++ b/www-client/chromium/chromium-36.0.1964.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-client/chromium/chromium-36.0.1941.0.ebuild,v 1.2 2014/04/17 22:41:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-36.0.1964.2.ebuild,v 1.1 2014/05/03 15:04:30 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -158,8 +158,6 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
-
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
@@ -328,7 +326,8 @@ src_configure() {
 
 	# Never use bundled gold binary. Disable gold linker flags for now.
 	myconf+="
-		-Dlinux_use_gold_binary=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
 		-Dlinux_use_gold_flags=0"
 
 	# TODO: enable mojo after fixing compile failures.
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 63cb47ec438e..15fe6b484e2b 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,3 +1,4 @@
 DIST dillo-3.0.2.tar.bz2 640894 SHA256 b4f2cd7c1be9f09e705f68c095813ea5bb9d72870338fc36c61d687e042950d6 SHA512 510b8d7201f73a60c44ced752fddad1ee9083042771da991e8267a118eb639704aa13113ff884f52bd4027ebcd6ab76042a9cebd1d50d1fcab22c5605b9cedf4 WHIRLPOOL df079d175c082b2fe25f9e24222392aea0226720ce8ba8053f2ae005deed7dd3d4974156dab39ee16ab38096c3942e47cceabfe0d867de3889ff365c903f10a7
 DIST dillo-3.0.3.tar.bz2 685824 SHA256 48241ca96d4c2f4bf83ebeb40c741c990fab0d6b0f7b9766a64234e481008dd2 SHA512 6feabc19b31deb099bc974be28e009b688338b7cf726e2c7d917cfa07e2c28bfba3ef09be9427e5156bf195623516ce81f8b8ef3c5c426bfac7de505c70a5ef8 WHIRLPOOL 7321acc181f5042139423ea7d62060e669651da04d13e6a6c5367fa7d2eff5629f58a777e037e38fccba895562101831f812d753c3cc24010fce56bcd7d77cfa
+DIST dillo-3.0.4.tar.bz2 738826 SHA256 ee2bab25010dd27b18ba80259df6eb8f6b549f5af596539c08eed0b70322df39 SHA512 57513342026288255f3a2a783f206a24b9b29a03f4721d34f6e43111d61b248c56e1212abdb51adcc826c4ca081f9fa5157247c00eda95d9b5287556fe9da175 WHIRLPOOL ac3c248960db329c24c0b138126bc4164c88d7844401f7d28fde3d16b656fb2cbc6ed2e8f43a3d42ecec268a9b9269f96a72b4ce2de1c33b777ca54b1d18e608
 DIST dillo.png 6135 SHA256 de629745e6f3a271475a501e2b94558b3deb7bf9a407bcef16426e600e1731f3 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833 WHIRLPOOL 13c584d7186f2c9f158ae9cf5921f75040c6c58a5eec2f0a04e6251b9c7057246308be2f0726cbf9d83ec1d07a9538251f159e05cc610bf05adcbb4f8c1e3b09
diff --git a/www-client/dillo/dillo-3.0.4.9999.ebuild b/www-client/dillo/dillo-3.0.4.ebuild
similarity index 83%
rename from www-client/dillo/dillo-3.0.4.9999.ebuild
rename to www-client/dillo/dillo-3.0.4.ebuild
index b73a1ef5682b..38d1bc7f5867 100644
--- a/www-client/dillo/dillo-3.0.4.9999.ebuild
+++ b/www-client/dillo/dillo-3.0.4.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.4.9999.ebuild,v 1.1 2014/02/02 19:52:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.4.ebuild,v 1.1 2014/05/03 20:55:26 jer Exp $
 
 EAPI=5
-inherit autotools eutils flag-o-matic mercurial multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Lean FLTK based web browser"
 HOMEPAGE="http://www.dillo.org/"
-EHG_REPO_URI="http://hg.dillo.org/dillo"
-SRC_URI="mirror://gentoo/${PN}.png"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/${PN}.png"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc +gif ipv6 +jpeg +png ssl"
 
 RDEPEND="sys-libs/zlib
@@ -25,7 +25,6 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}2-inbuf.patch
-	eautoreconf
 }
 
 src_configure() {
diff --git a/www-client/midori/midori-0.5.8.ebuild b/www-client/midori/midori-0.5.8.ebuild
index 994a1b4d055a..5aefc5570b9c 100644
--- a/www-client/midori/midori-0.5.8.ebuild
+++ b/www-client/midori/midori-0.5.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/www-client/midori/midori-0.5.8.ebuild,v 1.3 2014/04/07 15:23:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.8.ebuild,v 1.4 2014/05/03 14:11:51 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
 	_live_inherits=git-2
 else
-	KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
 	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
 fi
 
diff --git a/www-client/seamonkey-bin/Manifest b/www-client/seamonkey-bin/Manifest
index 897e28904a7f..10d71fcd4266 100644
--- a/www-client/seamonkey-bin/Manifest
+++ b/www-client/seamonkey-bin/Manifest
@@ -1,28 +1,3 @@
-DIST seamonkey-2.24-be.xpi 814307 SHA256 73048f93f2bc1de227d78f4baacced8ed481d0effc1d7b3b1073464dcdb7d872 SHA512 ade8bb7de215561c5ff9cdc090662d3438b8b519c64d32347b5155b31ed6013e240a36d4e97803d6dc7c14dde9e8a4989cc80dd97610d114baab4c64aeed4c09 WHIRLPOOL 3b091b62dff625403a2acd25bd158adc95a6452f5382497df3395b21786031a92d6e75a190c10d83f2dfa5208f3da72210eb1a64ea80f1047e8c69c12e426322
-DIST seamonkey-2.24-ca.xpi 811480 SHA256 40bb6f6ac6e3e2739777eb9b219c88e232e2b20437ec15ff93344cabd6f61047 SHA512 69ecb9db8bb4b49096562088648a77032167f0afc1f3cc5e02f651e0d3390e3bc852d123eec26a1335b5648925d53d2d34568d265d0ca7ad88e41327d02eaa6d WHIRLPOOL c29227129f77dc54f4f12835ea6bbc511dc8f2228ae360d012557ffd0339d4d397771a9c1ed35ee40b090bc66cf6b8a1b73261b3e916237d1a833bc8be30611f
-DIST seamonkey-2.24-cs.xpi 809460 SHA256 5605ff0b35abd28c7e84b87d2a30434803f74263e53b8b1350a9836fafea71f7 SHA512 98990d92fb4d2483d60fa8f0bdaf9c301a63c37724f015e93b45fd619f68ed9499130371154c5b83c4ce4bffbd55096df271c61b6a6279e8f2ec3b97ba028d2c WHIRLPOOL d67b96d6c944b5c07b4f07768b134278a0555dc8a98348dd2c0bb8e7cd119b0407823f4c5268176cb1c068a0f0e89f5a3fb7225dcbd892941cea341797b56f8e
-DIST seamonkey-2.24-de.xpi 816146 SHA256 842fdef4a36a9f5f9ba99e51e4bd99e0890eb279ec151f1a6527c90d123a1997 SHA512 1c241a25461c4b57a361adef691230901af8659f8a9610ac7e0b4a8016184e8386c99a3dfdd557d8203b66384a2111e6a89e02a71d485593ec10a0cc621ce9af WHIRLPOOL 4aa07736559d92843da575e64032a4f983aac1a25e258ebcdaa2d04a38212971fe30db48b080773a3a76281a510a810107cfaf95c1b3c7c0f34efedeb824af0c
-DIST seamonkey-2.24-en-GB.xpi 781088 SHA256 8da55c64db56bdb9356c51d21a4a09a4530541a38e946543496c60bdc60ef1d3 SHA512 9b4244b405cb606634734b21108557f775ea5ed62cab8e6ed41a4eae8f4d2be692e7f25b6dca7f4a3d59fb47c3785480d23e4937d9f3fc103229715b578abad7 WHIRLPOOL ec2365bf0da6b1d8a386057a0f94b11b6d9fbdd078769010fc8021fa2cefbf1486daade6dd18f5ec86fce7d838de197a63a2606342234084c0d0a5cf8a2c9dee
-DIST seamonkey-2.24-es-AR.xpi 838204 SHA256 28de7925df64046ce11476a5fc463e6d166bcf1f895ead8d96c563c636075052 SHA512 a67759c237b6af762f40a162a25dde1b7cca1770cf88d38d2d1690824162409e36c9b68a0bbcd60a624e78de55fbc7218ac24d92ece324e9126df02babcfcf00 WHIRLPOOL 42307472aba6ba59a2015ede2283401d8d65e039835ddce68368a28d3eba248b5986b6aef3f9c46b70f50b56b4e3445261d8d64f8560488389a722f48b8f4b75
-DIST seamonkey-2.24-es-ES.xpi 811306 SHA256 88d260366fb1c841c46f464510b45e4fe76b636faa02ee649e8143dba8143434 SHA512 800313bac66ac3c266da54e659fb858c3337d3147a137be89127da8bcc7214b2f7cae44f9d2bf3851e288b0b83a59054bf67a1115a2b91e8c7246cf56f12f85e WHIRLPOOL 86c3c5c45a7024ea0e36f2ebcf7437e183178412aa69511d742181d57077348f69e7a87dd53d40874b45d4b8e1276d6887787778a8e401d5fe39f91cb1932a8c
-DIST seamonkey-2.24-fi.xpi 780302 SHA256 209e64e3e4132d05beb124f3642e57cd5a341d73e417644725c2a8060cd56a90 SHA512 ea7b02758ad5c7a97aa53775e7430c4d0d98c51f9e6d9ac25e6eea6059b774839d88c8effde737243234834f60d94ed32932581d59ca414451ae3282e7900abe WHIRLPOOL a9424767e12bc434dc84709d11b2d6d41729c01a5da2d08567f4a66f933b1fb9b856845237712fe0cb83b468ae66b73f8d5e02475f7123789467f946f1f3f359
-DIST seamonkey-2.24-fr.xpi 790321 SHA256 db23d07a62d4f0a7f5a42f2fd1d33a0704ba484c4801e9d218469deadb122106 SHA512 858a22fddb910c91722ab66c4586c3042117bb0ac1661986a78a1d5b26a7cae2dbea8cf9b1e7a71b824ae88705c2806fdc2fd021281352128b2494a7e424616f WHIRLPOOL 0b92af3e33c9ba4496a9770ce78861677f5b2c71bf444e7f9cda189e9427ff783613c23eaddcd83eabaa1cc9be262138a24febd2fbce15e9d22100a3b81986a0
-DIST seamonkey-2.24-gl.xpi 789063 SHA256 9bc816dda158a5840dfe666e63c7045a73c12021ad1b19ff57ad8b8435124789 SHA512 ef1d78a14f41a28e7ebf27ed1d31d1c04c229e793e258e76482fa44f578f4b9fde433b62e566295a6e4dcc8cb5b0b2716be61947f31ee4a006d7cb6e681a505f WHIRLPOOL 1349eeba02ea474ac193d65050a63921a9a661405141f54708b3c4a57dae24a849a89d4e1c2a17ae2c268618127d64d9eeec393d862910143b9f716111308205
-DIST seamonkey-2.24-hu.xpi 823607 SHA256 44099a7e28c99e40483bcec2d1e33e9fe46c493f6dd5b2f95ad83d3b164e81ce SHA512 659fb0c28cf6810b821979ab7f291421d96eb19d64c6c598945b6e1a9da56e174ed4828dc30ea22d2a6b36cc8ccb262343e425d74b81034511df325750ea490b WHIRLPOOL 1485c1c8ae74b0e9c520bb09a4d43d4ece6bcaa6c761ccbb1f9e0f824b603fe33bfefa871b4e33cc42f465571f8f1bb319c27216909b4598793e8ca9c64bef9e
-DIST seamonkey-2.24-it.xpi 725388 SHA256 c4225ca1648957624fb801000404166072277730ce5b3aab3cf815a787c64acc SHA512 3606a779e5f91cfd61872036e9af7645822cb801905a3c77ce3c988a3a96e94fd9a6705a4bf7279fd441c8d636cc1b9acc74285942f7ca39a3d1a6d6a26728bd WHIRLPOOL 059b9adb22fdc000173d3f32ee8169f938af06ab768cb897904164fcd855ecd0e2ded21c406fb10e5d738fe6be2d3717075d3a52724f722c526809dc99c73710
-DIST seamonkey-2.24-ja.xpi 862158 SHA256 246c15ce3c6f2245b518b08a88390879a5b0e329467f4d108f13e526c7d9201d SHA512 bd72822d4e14ac0685945160a1630aa2b37736cc93f82cebbfb284a96cb63d942dfaf04affd28d73db5f41316e53fc9a216fee0e814a0cd50295ae5be32a22d0 WHIRLPOOL 89521052ccb57dae1e6e31ea0b84308bbc239a2ba2fdc8f855aa35f672d388830b4500e13ac7a1ba49d499b0e7437dfbfdadb6346088a91c5f7ae6afd7757bd4
-DIST seamonkey-2.24-lt.xpi 827034 SHA256 d92d7755ccb9a27e2c473eb36c76f3735633d6671dd681d3613ab0e0ea4987d2 SHA512 ec5b7fab76a4d82603e2827f416ddbd25d8507f1bb0d14375110f7def5553bd9a84a493da668a1927c9e1e3229bc0b6a87365490fe787eca56c71bb3dcd4ea7d WHIRLPOOL 8fd4383c8737de6c25c5ffcb1f5b211578db15858bd59d2783b6d16aa3aed235ee255965c5e16c855acc8a7eb65d3e62e99dd63eba59e46f2936ec11619c66c5
-DIST seamonkey-2.24-nb-NO.xpi 802295 SHA256 083be6b731ff4c0e97c1385d66719765e1e09992015686acec6057ecdd2f8837 SHA512 4345518bdddbe2a0871e2d4c1f5bc2d3a9cc4608979ff8d39e510a46fd8b72c05d5d54844203d2c9173c51b96d2f24e5921854ab33ea6e78e21e1b2ee1ddd1fd WHIRLPOOL b10c188ea678f382002a2f1a592eb46c4864279fe1f026000931af8277f6834fb434190e1fdcbb3942ba915a7f4e37daac5f8dc676f39c7eb72f36daef7d1bd8
-DIST seamonkey-2.24-nl.xpi 776386 SHA256 f58c6c559b678fc978d7822b67b11cdc0d54d055bb5a6c6059d2bf8e6ebc5d54 SHA512 88667cfcb5f85a823cba6730ad7d7a363948491565c425de30e95d1512976550479716182a82f6415359ff6d8740856e01d478e1837eace73d29bb21f6f591ab WHIRLPOOL a878086c23a00b7788c3017f87c367c9d35618e251ebbfbc1283140bf7fc69baa667b28b8b231664d82e15cf53322d36c972060ce8d35d00acacb1a0653507fd
-DIST seamonkey-2.24-pl.xpi 852730 SHA256 e5406c7cdf55841544806445e3f9f86532bed9e09d3da3077363d4e6cebe9fce SHA512 0afd2cd567f38700132a8f29c928cafa3e515429dcac5b9889be0909a4623fb2cbd1196ff88072d3d9c3e40a4c51d32c70d01ef80cb57371c21a0f834b304c32 WHIRLPOOL 50d006af62921302a01033d02b6c21a7b0aefbe98703c15ce02095c757b8eb42067a9cd0f7f6719bfe2a8df3e50f9e401f36ceca68dde29412a2c14ef4faa38c
-DIST seamonkey-2.24-pt-PT.xpi 812004 SHA256 66dfe3c112c1c6c071b6a0086531f101579d1c92a0d909bbcfee48aedb647969 SHA512 3bd97ca438886248bcf0f50cd357beaf5284f343201c98b5850591e933685bf20e9cdb825bf4a626b8cd614a691ceb3868192cc47490e48fc4a621354038c5e3 WHIRLPOOL 38ea959a3bc295aef21de5e46cebbf6f6b0de5026eea250dac07ee09b7ac030d250f9575ec5444977ec0d1a2e288620152e2be7ff7c09723094958eb221e0f67
-DIST seamonkey-2.24-ru.xpi 882614 SHA256 d6679b379995552a0ad7b096daa94dffb10d9392a3f8936592deedef4859791b SHA512 b81a85debdc70baf6cee324a000cb05064d5a3ec8bf3986c4e57b8505651d65294260f37dd23a801f9a44a5c3c43e9efba1322b9037df50ad90217f33df8985b WHIRLPOOL 5dae07699742e7b578f87896e59ec51d63c36e4cc214c8f32cb05ccf495ee6f565a9b37c1824579f956288906eaddb53d7c370cd770ac378be2a8b2abfeb6b98
-DIST seamonkey-2.24-sk.xpi 836795 SHA256 4976e86f4faa81cc7ca5ca73305f827d0347a0e2990377fc00c505ce468cb777 SHA512 fccd8f7fdc33a770b37717ecedb39573d1ebf8a592ae82992eb9786190e884a19f2fcfeee501c78f2bffaefbf679fa4234803f23258f30a8bb97dd02e2f17f86 WHIRLPOOL 0d9728cd88769be415817bef8a0a45b310db2418ace0f8ba9de5b866ea8a7ab66ad117e38d4a62efad0c3158b26441a89b5d10fe9e96908efb0940c637b34ea3
-DIST seamonkey-2.24-sv-SE.xpi 804953 SHA256 a1cd1c18dcbeb56ca35e4d14c3c2f63e682ce3f51179901c640277cbd0ecb33a SHA512 eefcdd3de9cc6ce11329de95301e2eed848d7131cd717bfbaa892edf8682c85f815054d7166c7e0ba547997c149082e6dd977e9b6e032d6d95f0b736af1d141e WHIRLPOOL e275c56f382d7ac67eb7ff019dbbe536eb526ea94d8f84acd56a6d5eb102b6b5c8f4aad6d51f5eb8237e3168c08b9078e61e2d98cceb7bb3cd1f46619e51508d
-DIST seamonkey-2.24-tr.xpi 850114 SHA256 59f170597e514ca92fab8f7139a5ece6f99d1410e2f52ca4b8452ba687c9b007 SHA512 440bec731dc24119ca4b3715de9eacb9edfa48babbaae69d5edd88a5658eca0353b54477d22bf1097605a46a6e43275e3d650393365c4668b8021528bce5c7f4 WHIRLPOOL 88d02ba3f6dc9feab9d1e92472436024c8a922bc8a747c97b67a27643196603644486127d45e9f6b54cac010be6618998149147796403395a6bf27f9f1520912
-DIST seamonkey-2.24-uk.xpi 852876 SHA256 62972d16d400379183758c09373b4ace1e579a2afa2195f6b31026d50033aea9 SHA512 632b4f5feeaf539ee863d693805f7d7edd104274d61bb0d10d09e61d6b2bdc9dc1ab610555063205436dd1a978be170a955c7f28340c4ef4c86c77a130fe053e WHIRLPOOL 9d12afbfb8302afb1b6616301a1d59562398f42f8385ae504e8073331b35e96595b90dbe2dcca12bb2b2d7a7cfd77a91cc9a413f37f993ad729b1115ec4c0f62
-DIST seamonkey-2.24-zh-CN.xpi 813619 SHA256 54d7957ffbc32b34ab6490d1abce26af07e949c265bedc887c15d8a5608f4914 SHA512 54c731f3cc9edf5cbcd804aaf7f5bdbd184041e70d728a036b2ba9f52a39550b7515f7e290353b4f39ea2738ac5813c87b286364507a49cce6119f0567ea9726 WHIRLPOOL 4626f826f482adbc052220e768adfb1c214abd1bc78018887549a707ba94e31009fb772ba9c7799e397e6d9c9a8e66c1724cd8054337a392bc2343614a108469
-DIST seamonkey-2.24-zh-TW.xpi 837900 SHA256 90f6ec47141d5ea1aa6809c2ae2ba6c5a8c17e86b0647e5f627c19c0d490fe6c SHA512 16cd8c5705d8a02ff0f402c9b79a2fa04431f44e17527205b26f7c223bdbddd0ebaa486b5e7374179cf4de4937d93c9ac14fab74f2011d3c96f4ca4e61d1207e WHIRLPOOL 935aee3101916cbb4d440ae53eef4c6103a7699aa18a86143684d83c34b4057bff8ae5a42343dd8fe07849c90ec408f4e5903ea311bba73aeb406d5c9a242755
 DIST seamonkey-2.25-be.xpi 817911 SHA256 89685620ee38c099b3621de2ef1e79b63ea2f8c2c73d333c1afb79068e971d14 SHA512 d1c793becadd24d7c941df3f5548dbd57d3c61151458e374fb5530a50e97d1041a8ba9ad43412c48a8e4672c01682f286064360b8fc2970cbc091861f47eb5bd WHIRLPOOL d4b269be01254412644fce2ab95aa2ca5cd8edebe8150f790fd5ae50fdc27c88444cccf641f6858e77358773497c11bd803d5c33d9cb0ced450e937299469c74
 DIST seamonkey-2.25-ca.xpi 815229 SHA256 ea59f8370f00ca40358ecdf489658316ffd44f58c75a3a2b0d4823b0b0a65a5e SHA512 fb7c43f6025656c9e7318f7a45e480f32fa355b8009f1b71b6749938a698ccbf6ab259603dc432d3a189b9017275db4a1478dc9f06d3677e5f6d503bcee67259 WHIRLPOOL e28d8d28c0dc7df54cc1972ecf190456e781d7f74bea28a9b740c93e28019ce134707858ba3a66f5e9c3d0a35c1be7910924287c6905e9aeb916abd4598da13e
 DIST seamonkey-2.25-cs.xpi 813471 SHA256 9e1ed7d0540634f4dfa96e71219c9b5ef13389b498185f8160ddc732402f8329 SHA512 46bcdaf14d833ebd946159732410c809b277253cc2b74a4c88935cc6e02036400d19aad024fad7ef36d0b186ff6c02968a3420b0e985fdd706c18f55bd0137d2 WHIRLPOOL c3fddd449f100342bd65b5348251a0d8529414ecfea94e7dcaa83525c860b3ceaf0a000a92afa400b1d3802ca877f805fddd525d22d99cade4e9a5f3ef699a37
@@ -48,7 +23,32 @@ DIST seamonkey-2.25-tr.xpi 789890 SHA256 3c3c54f359b08a508ce014b1edb99db4ed04552
 DIST seamonkey-2.25-uk.xpi 852254 SHA256 b64369e2191eaa97fbb11a8e3e343cef42f3156ffccb75d97ed48a71158ea29f SHA512 9d07687a2eaa5b2d904bc11c2e1c6a123079b197bf95603ddfda195193ec429009c1247ecaa71351de8879561b4c17cbba60f33b8303ccb056383e8e9a88b8e0 WHIRLPOOL 86906bcc2b40a0a9970190cf90ee14470827a310844f917ecbb001e85c0ec5e32488feb6424985de75d3aeb5521f484a3df1799ef91ca55232f07b577bd87913
 DIST seamonkey-2.25-zh-CN.xpi 817701 SHA256 2e00de1f63e08914d954af80b6bd19552a268f566ca16de587ea673df4d6217c SHA512 7c6fd5bfc685e3f81d1636ba530cc9d9f27b549df30302c58557e0cb6271414c7678f96b8e47de37f4a58856cb45498d3a63366ec1b9de62991af76c2c52282a WHIRLPOOL d698015be75959c0dfd65d93c212cc5e2f6d439f21f61e6e94161f74230a12c67d7525cbcf92724183f7ba2bb2a51907ac66d55bc01e6b4b4401403eb1465e29
 DIST seamonkey-2.25-zh-TW.xpi 842075 SHA256 fc24d601697ee73d6cebb6bc06cc8b22e192716b343138834788d4ff7c9a1863 SHA512 13b8333aad9085f1ffbe42b1d9814e9012ff2191c0be757c8b116685f41750b94e0cb5ced1f8d3a5bf262d5ad7a13c60274f0d2243921699ced18884809dbff2 WHIRLPOOL 799d4a6a45c7137c0778f7db8f7c6157d8946dcc83da238ca2295a40d2f5e8d55ab80f9a8a8d9816b7fe88426bfac8aac7702385d12ad807b51fcb07cd4311f3
-DIST seamonkey-bin_i686-2.24.tar.bz2 29803592 SHA256 ed4ad37ff9c5d0d36f66bf25b272698e6d5bcf828cfac694d15467d4a4014ce5 SHA512 df03a43ac23bd8111ea3bf2875d431c32410498b26c6067580bfad3c662cea8d4c6a0e6e097d7b0ade91b83f436c41ca3fc3fd9eff258a564dff983a7d71679c WHIRLPOOL f8d2f385260321883c2b65469fe232c802e078e8447f4d4e4eaad924c01966a08829a2fec3fdba939e71c259cf71c242e0968bd9fe6ccf24f42c748aa4456b48
+DIST seamonkey-2.26-be.xpi 818751 SHA256 bba364903e2cd080a83b4c7b06317ce547fce0463e46cb1ff5241dcd3b0341f7 SHA512 c80819046b7fe6645738bdb4849a068e8e35698a5c530b63d29195b4ec2876956892711367e570c9464546bf8617ec1103195efabbc8949d32517bafde013622 WHIRLPOOL 50ab8395519f815d1ff214a32726bd1e46327d0cd95290ac7a1ed3897eb0f70f3b019807b4cf88d91905a853e911ced42f93267af26cd5b2546db7b68b18e173
+DIST seamonkey-2.26-ca.xpi 816735 SHA256 8885d0412bd420b77a831bc28aae685d0962ef840ddb16e380cd07a2f2ef176c SHA512 b6aef44fbf848a8240c28659c2d379d94f6053166424b9c46466e41a9df96a7917f9bc6deccb5d64d2c0362fedacdd3ce7be0704ab3e0c76c4cf45b3e1f30ff9 WHIRLPOOL 21b15cb74521f21489f47652fb660138d2796e0cf6da58c2e7122914a331131653737b9cff9b7503087c712ea71feaee5c35c5b82cfe626346adaebff1e1e094
+DIST seamonkey-2.26-cs.xpi 814944 SHA256 cc77420a27f8e0757bcbdd6f8df2be361883ae1c5840e63f63a1386e43bc498c SHA512 91dc46661d494762895ec66c76e804a22dad3854f8e1439807636721b0052790b4ef14aca360b0ec742fe5d10eb71c181e9707af62c335328a10d07d79e828da WHIRLPOOL 50ea7fd10ba9c12193e3d11400007e8a68297043979e7f8a5464b63d3e26289cf21345ac6eccc20d14da6884d8a46ca13d33415e48fc0c3b335858d912a75e76
+DIST seamonkey-2.26-de.xpi 822042 SHA256 960ce22067f7cd19ec30c1249a588c651785a8989f374e14e8d06de8dce35237 SHA512 054b312f5bd83750f6db8a4520a6bcd67d51b263c53e1eca9c8df37812095260d4576cea24437a47cc7f79801a025198e026546f94adeeae96b7b09212d7870e WHIRLPOOL 8f127568b35e62667fe508408b07dd2791b0f851c9150d1bc6e8946d88e682acbee4407051d84f123335215344e2abb48dba412b6f94eeca57b056eb49e95f2e
+DIST seamonkey-2.26-en-GB.xpi 785904 SHA256 42aa60112205d55fb9f835baf1a051da97942a950a17fbb37f0aac7cf6f5135e SHA512 e8ff828d9c62f1b4bbf192433a9aa86baa17b181a1dba903593199cf14ee22a81cd2119d69d8f8b40fa1c842ac561c5b1534748aac58537eb26393cd0759bf7b WHIRLPOOL 5e054c31ddcce50407f2e9d9fd137f202be40a1c6914fa6b2677cd83231fd7b747a37bad55367ecb5f46d14626d9f06e812bfd44340b4e16e4929985cde1c306
+DIST seamonkey-2.26-es-AR.xpi 836833 SHA256 70e3502d5578c3d793645c47872c436f92845800f5a74bcea3803b2c5db73dad SHA512 1b676c1bd5b195bf07c54c18af32cd6336881f74d34602f898b465f833afd82435c8ca4ef0c32b27a6fc0e53d8b59e342b7cc3fbebc521e89ca7d711f20dae2b WHIRLPOOL 96eb57fb2ff5df9636dc95c18dbcc3f9905ec6cbb93bc35f1f7fad99b7ff5d097f5d0b722199f4592cff569a8fee1c17212f1538689a25bf37c93f0024731183
+DIST seamonkey-2.26-es-ES.xpi 814002 SHA256 13bdb45b40c8a9b03f3c93aca5d120ce163a9dc263c68d9fa225826bf429c1a0 SHA512 2f09302a83ff0228d2b4e22ce8400e26cc75489b378151b5fc9a8c26585ead55d47d90f1ae04d53aecb14ad6232914ab1480bb449b0f7c99b45c77769abfe99a WHIRLPOOL 0e15f8d1c06a3c12817542ad3435cac7d5ccf4c732f0d2f7b02d08ef103cdff52a6cc6bc1509a04a567d55ec4152bb00df86c7243aba3649b021dfbc60cda72b
+DIST seamonkey-2.26-fi.xpi 784387 SHA256 f21cd2e898e11039b2909cad62a71e8f4ee769c68c5681d82300f95c9c70c00a SHA512 994e7c42ae12b8c271349d8bbacad810d9f63b4b2ff90eaef173ce42daa803e4bfa50fdde7d0ca9c4c7ccc91edd27efc0435a26791307b7aa4c222e2335a9d25 WHIRLPOOL 1f7e63f87e421cef681535c4bc7bc79354b2eab4557c07e842e7943ef33288f92a573eb8d3b1c33d6f924efc60094f7ba2eca82834f5a01aa1140ea796455b31
+DIST seamonkey-2.26-fr.xpi 795188 SHA256 4e892a84852f9d7470c7c7ff4cc6ff8da0cb5bc8e8197d41ca3105ded6d7356d SHA512 92b829f03892fc130258d58dec87410b825b3de28e1242c1ea8ad475a94bf94dbbdeee52b6d2c151f9db0323d4323f877d050fa0740f6e5bf97a3783e2fbe959 WHIRLPOOL 971444fdccb22e95b8fccd4803811664454c308195e8725f5c46b345e13b60af0951e4487b2ea55efff4905306294b2b216885c5b727e8afec94d9e12b9e7362
+DIST seamonkey-2.26-gl.xpi 794258 SHA256 de1db0aefa37fa6ce4ca2ab6ddbd53d4466e48cb435861270266ca0f56e338e0 SHA512 b13fa4db22457bd6023521d704ff542bcaf2c35383681bef0a102b4deb6011270cdedaeaf8f0eedc8800435e83b536f880aa2102c8618350ddeac166512041ca WHIRLPOOL 76f3decd68dd95cb213242b6276c59cccf749f5f88c72d7167629ca7abb8dc703041a250f65baaac540d225f268904cf662de3e92f311400c16e1b018da61176
+DIST seamonkey-2.26-hu.xpi 828526 SHA256 a1c8b084b6b64bb0b992e9a05c6fa49c9a5a48b437e86351b8a2ed1f2997f22c SHA512 97565d5a66568626c31fbe7038e107757f539746a3f5e167c24138f5cfb48b17b6db6336370a3583e2f417217fa33e8c70b74de2f73875ba37a1343f2329e191 WHIRLPOOL 03bc3bdbbb74b0e8dcd03f675743a1ee6441f7b87c3927e3485c3475ac82975c185a4451351a235ddc67a5d55a1895596e4d44f6bf619a4e434734599c747264
+DIST seamonkey-2.26-it.xpi 728566 SHA256 30dde81ae8bf1379caabc0a7e35bee72b8fa9fa052136de333dcbcd7f3ea550a SHA512 3fc510cc971b658953324021256045ad3fa70ffd25eb06a15aec14bc3b9bf55b565b85cd590515ead03a058a81f54e1ae8c9a7bbd2b4c1a9ffea1c5df782ed0a WHIRLPOOL 8de0ff54177d3267602f478afa506be71f225d035b4cd2ed67db78377e45eb015f7fcedb6a27bb5126b4afd98a510095c54d7453ef52bca9dfdc702abd26737a
+DIST seamonkey-2.26-ja.xpi 867575 SHA256 002743784937853e368c31ca5f80056eb50bd91dfa3f791164e388ab66e1e160 SHA512 084c32fe59c1de8df856308908b3333990341726a13594bf7bab6ad9cb6da0bdf0d569ccf3958143e38a141f1884497ae7fd70c96c940c7c7441602d684d2815 WHIRLPOOL e6304ea6b0850e000757c459dd5d9f032fec7222bd27abc71fe194887894481b642807ce1ca1437d3f5da35dcd91cbf1d609e61c1af8998e9fdffb38fff84066
+DIST seamonkey-2.26-lt.xpi 832068 SHA256 5beaf750798ffe4979e31e19dd88721df2819eeb4ac6cfb73388c0acecfb80f3 SHA512 bf809df4f42ec305f4b8e6357f70908f72a0ddc33a6075807c203273147d2296e34df4fa60ed9675697df988bb7aa3634335f14ed9eca7dc4534e56e8e1fd25a WHIRLPOOL 909c4f134f34a0f1efe70a8846cefb50c3d1c1c444081b6d4ebebf79ff99e1b3652630ca14db6664dab3a5299f16b75d872fa9c752edc31fa0b76842db928ffb
+DIST seamonkey-2.26-nb-NO.xpi 805527 SHA256 5559b7554f6683b7ad444af019d7ad75b13795f6669653b3be9c0934d12857a9 SHA512 8110c660430ecd7fe986ef83a2c9dac195b82034c4193bbb4c81e4b3605c87de258ad4770818661aacada28318a0c68ae704d7c41c57e503f443131281497e30 WHIRLPOOL 9bbce4692359f50698d5307caace84e40d56704bf54982665a93dbf1b15ea3b7d0e4fdc09aaa509edb6cc4a71f487284c08c0ef0d2d29843ee56bf3e1620c177
+DIST seamonkey-2.26-nl.xpi 781831 SHA256 794019b24058071a080b6450991fa79ca71a447df7702e6384785895fce18a34 SHA512 c03f1b0e1758891ee29c6bab2f0f0b01f3e6dff306f575d3af776cf04b006654c76f345391d327e4b0f56485ccfab215475988d42ed3c913b30cc825956735da WHIRLPOOL ca34644b178c2ab54ccaf1428230f087818262dfd95da4fe72cd041d03db82805d62e8a92e6dcf7da5a9f94f9606a94528e30fca31d4a38555b0fa2d557481b5
+DIST seamonkey-2.26-pl.xpi 855815 SHA256 fff16b9b77830bf983c49e42516091ec987a9616168d8040598799349b135e1f SHA512 9610c6dff661fe183c1e9a87c021fae62afc22bc53e3b158c818da7c660be88dbfce1dd7fc34d4f7fa6572322031769770538c7f47b9e504083e37b696dd2c46 WHIRLPOOL af1ed58c5500a28d86dcee5936b4a5a1ca85dc175f0d58cc9a7f1270b7a05ff092f0d240f8de8ff2b6a35b79e2ea3e76f8655529b2e0b8bc110d3d6295b649cc
+DIST seamonkey-2.26-pt-PT.xpi 817865 SHA256 35ecbc2df9c90227ce0e46d854237272d019ad4a5c54e459cdf82a601a9d52dd SHA512 9ff8519ff7258dd8b4cd56734c022b3454202400f11f2eff3f0f9bdfcad6bddd83f46843e368c6eb62ef8283a9dd9e7d48e2fa1ec183b848e0df20330ecdfb95 WHIRLPOOL 543bcca92877dc419c2fd8b73f0a7d646f6d9cc9091c58dc5916f47c7b3f7b44f479664a5c9e2643faed51f98543d92fad5bec46a725299c0c700463b1a988c0
+DIST seamonkey-2.26-ru.xpi 885692 SHA256 9c4c665da191538e1e836ecad5b4556f5a9ed4a4db94c4779db537dd2cef1c94 SHA512 3d3ddd334e4dbc289e920960c775003242c8cc0592e25795493a217b59819c19a43a6d3a357059b5987ccfdce2c7cf759d527b571ec4501b15e0af4ebb828561 WHIRLPOOL 2449d632ce0effda7510eb4b4243bc2a357677a826148ce84ac530180a546c3a4f51ea4cf0e80640882b580fdf3d3a12b7f47a9dcfd492e0e7b94be8bda6995d
+DIST seamonkey-2.26-sk.xpi 841872 SHA256 dca3c93b1b2131e58483a537961df44a044b80f5cc97fb2628b384f26e973212 SHA512 43d4174e3f1ceaf55e71d9ee593795074ad38b0cfac82f46438ff985d2c7a6ba609abaa4e46c36b390e92c4740e07f7d20b4e4df1ba448e4bd6a389bad2aefee WHIRLPOOL 91b4be48c460e32a9c2f929b2f3940437cde375e007b7200c463ce2a2f7bbc4df22eabe032d42512d2edb2451c092d28d55446b85a47df3827690397ef6da92b
+DIST seamonkey-2.26-sv-SE.xpi 809829 SHA256 e55f7d962db49d461b3b2cc2cc93da46da64139164b8d83f2e67df35bbfa2979 SHA512 fb6409fcd96fd04ac5010f8da40b5d6a62b5a034cfda777cc08cdb61a3b5940a6f7fd5f66b7abf5e0f1209d413fbd441251cc1ff1b73c86a8b7967ed19177bc7 WHIRLPOOL f4e429a9c6793aef2249bf8001d8e9492da4810337eb6998b8663684c062ff217b92953e765ac9225ba43c9a66a9cefb3800c23a4d429f3dc67f481eddc59901
+DIST seamonkey-2.26-tr.xpi 791385 SHA256 d4923efdc2d4e3a294b864c1fbb9fe0a9a9d0d3636cb4ebed2e2263fbabbe5fa SHA512 a3a393cab04f505b5aa4b3ec111114c05a17956f915510a7aeff396037d03627bed6fa522c3ee1d7ac7760486ff291cf49bb9172a0e8ef86e7acd0a7c70e69f8 WHIRLPOOL d8920793dbcc7ec352b68f004cc28a3c84f8063e6a62db1c9f773f05a2f66c2b717e4587af460ae375a6616707349d2fbf5f37eb372f12d8e311db1b27e10635
+DIST seamonkey-2.26-uk.xpi 853567 SHA256 ebdc37f591c32ddfe8783257c3944b6a44be15a2b10be4298326c187caddda81 SHA512 2430eba49aa8c3478c2a9a2888168b0e6b31132d4e4a81ee6cc2d61fd59373f91e2d9b2f20b0373c6566cd96bf7abcc5b8320b920cec8ba208d84dedadd2a3e3 WHIRLPOOL accc7e864c65228a681e805d50849e5e169f0b7dd39aa1a194afb28e9ad487cc4910a2d5d89d6b99074d5097eabd92b941a92f422b6901811341fbd4a35834a7
+DIST seamonkey-2.26-zh-CN.xpi 818845 SHA256 57ab3c518f60627b9cbbe57f5a25b22dace427ec9597d395953104732a5cf0fe SHA512 7703e06578c1820a45b57eda2e117d7e7ae8b8afdb3fe98980d5aec02d39f9e0b38e55546bd684b8fcce25b6ea5a4f43c0b5817fd6de93a6dc78d0f9c9ffbb35 WHIRLPOOL 314b41da8837753ebfd201d1c26f68b793c460069d370cf84105116f4c70f6d1076c6315a2bce2a24944ae34a41723138d437f936f082de16f82026caa77601b
+DIST seamonkey-2.26-zh-TW.xpi 843200 SHA256 2512be926be2859e16e058977e9dc31d29a3c8b92eefe5a6b3a6f304325cb7fe SHA512 456991409df15d7f8a71f9918cf493ffcc44a9d25477b3412d37e02e306e537621c0ac6222268b419f9450308fcb03949278c5c7e64a82e67a6690ce66cbf6e7 WHIRLPOOL 6885dc1813e350cecac3e32d9b0fc6402578ba6aa12879bb8531ca0afa2d1a7f682ccd6f9769f6cfd17473fd710ca452995b107a81804cbcd1da581ab8ee2a76
 DIST seamonkey-bin_i686-2.25.tar.bz2 30377947 SHA256 67892c00243b9a4f2964ac61c9661e2d954ce33bc27fb10588f650922d5e3c62 SHA512 18c8bffe52dac67d0204f480afd3ccfbd56d4f4bdac56cc493cda597a2b135d08a5963baf0c44ef341eda3afabeb4cc08c32bcb75fbf8878e8f786a37d8bb91b WHIRLPOOL 8567860b0f38a5edcd9d3fab229172df40e9672a1099b2b569cf2ae943eecbfb703bf39255d8798035ee6a3a63a50cf7d2e766ad7425d6d523857dc33ab1550b
-DIST seamonkey-bin_x86_64-2.24.tar.bz2 33511010 SHA256 a21e218fb9945df0469670d9b6176e89f0b579b707eac6f7ffe1da94fcc523f3 SHA512 61304bfb5b694882d3f3000b2bd57043cf38172a6ca95f259f47e1831d62c74931fa461ef77c8156c79ea2a50a1212f55a5de2a4b7f1df6b891ce912382f058d WHIRLPOOL 4ea0ad5bb9df33df114a552284789d6009ef36be59ef5622c3de74df62af4bec12f29ad171f09fed783867e26ed9b7e7a855143ca253061f57e25d2445ca60fd
+DIST seamonkey-bin_i686-2.26.tar.bz2 30916325 SHA256 4b306933c629bfaa0f6f4a8e5db08a47055061e3db87010b4c1e058d4ee4e0b2 SHA512 8f3f73c02bf4365d03225e80792f63bcb10237dff13d289e61796a54e0f02e23e3c6ff0922274ffa9b076bc3b333717df1d2e48e091462dcddf416414beab719 WHIRLPOOL b37b701f825a3a6e2f37bc1f4f47727644881e3bd3c8e53cccc0a34b2c8cdb90fe57226ce693e6e94e436d750ff6a86b191702749cc426c8fa422cdcbff3c684
 DIST seamonkey-bin_x86_64-2.25.tar.bz2 34411462 SHA256 a62a2e55c843289f8d19f8b707eb5a9341ae8776d52f09f149294561af7b50fd SHA512 c625a2d4ed0655b087b5246f0d83dea98e36f85d1f2c524f158e1844610b5a4f0e20492638643b76027f5bd6cfa041e5d66c8e40d5eb60fab324b55f73e9ac5a WHIRLPOOL 4ed53aeb12e97343d364d6d9ffbefc353973e62d1df8da36f8ecdc1edd3e2df5e663add14118edff59ebc7f5eface2f69c82e1716002b755ffc7e2c563aebbaf
+DIST seamonkey-bin_x86_64-2.26.tar.bz2 34884248 SHA256 605fca7ca1529fd0116303a95e9db86628162ae660308935b90d3aa857cbd8ef SHA512 643fcbec52041502b187f416f68e31bf6a17d076524e7fa5a0df844b1d7f06af8ff87cb941d144193c17f1c82bc82d285751ee00d54b12b395599d52f1b36b92 WHIRLPOOL f9a9d0b3fd22c71c6a69bf5e4f7a025274727f4c28a653106e990591f8256c02aeff88d950c98538f6ccd3221a01f2e7fd6a24b9535157d264659694a22f6b75
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.24.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.26.ebuild
similarity index 96%
rename from www-client/seamonkey-bin/seamonkey-bin-2.24.ebuild
rename to www-client/seamonkey-bin/seamonkey-bin-2.26.ebuild
index d6081eb8dba2..2f3193464ec5 100644
--- a/www-client/seamonkey-bin/seamonkey-bin-2.24.ebuild
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.24.ebuild,v 1.3 2014/02/15 06:03:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.26.ebuild,v 1.1 2014/05/03 06:34:21 polynomial-c Exp $
 
 EAPI="4"
 
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.seamonkey-project.org/"
 RESTRICT="strip mirror binchecks"
 QA_EXECSTACK="opt/seamonkey/*"
 
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="startup-notification"
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index efd1ed543058..362a621bef30 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,5 +1,6 @@
 DIST enigmail-1.6.1_pre20140112.tar.xz 916028 SHA256 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149 SHA512 e05d9fcb2dd333cdca487d59a31bf045a568762e6a961267209bb4b5c8b6a0fc5ef8096b970302bc7bac9bc7f963d4a2d3c1d68326c4c18c7e93eb63308b0675 WHIRLPOOL 7a5d6366737fe239b00bcc8d805e6904fd5f9bd9724adbc0ab0f7752ec6f1b8d0bc961c250f8d51366265d685a1c66a3efcb86a23ebbde36152588bac97f576f
 DIST firefox-28.0-patches-0.1.tar.xz 4888 SHA256 2b33e263a645f0b8c5656ac3d2ad9ce9571e85642c6d5a24ea9549967181e727 SHA512 ce15b0cda105dc6606787c1b24d8f97a068cf87f970f59a181cb520791326ea2f78d5694234cb9f0baf1e5c057233263608ca65e3ebccb60bc0d3f20a4ee7303 WHIRLPOOL c442b127c29ad1cc1f03419bfbba86a5d93ad0e26561ce72199bc58ecd483463dd40788275a1e0169711a90b4bfc17a8a90b1faf2ae749fce9415eb870b4a286
+DIST firefox-29.0-patches-0.1.tar.xz 4164 SHA256 b1d4517d73356884e1c362e0131bf66721bdd42c791f045db9d2753e7878ae3a SHA512 b2f987f9daaaa9fdd3085f831af1ba6b23e25d720d08771e54d66d77241c29847a3f68dc7fc8f7dc2484b3bf05e41bac23583af68b2a7bc5e713099d368cf35c WHIRLPOOL 3a35159062162e3ad0d8a22c35c0f2964ebb69adc101f8f23ee725ae7c0a349d32cb048cd023c00628c06ab7ef0c5ae26b375459eee3f37fe3b3308de1bdb7fa
 DIST seamonkey-2.23-patches-01.tar.xz 824 SHA256 8779254ea0632c52090a70f7b0943bce0787e37b1a2e683cf49a3238d705af75 SHA512 03420b11e98c728aa001e755585e8ce1f9123160cb69042e4bbfed46a5cbaf1c567938e0c4d18f72d58c55bd780ada467733677f924c6bc6ab9e070c89b9c472 WHIRLPOOL 729e52bd1a2da0d830a1e5602fa980981648ef74123540b316ef97720798021fdb2efaa505cc59b9a629575656cbf469ec160403d395938375c55e570730d056
 DIST seamonkey-2.25-be.xpi 817911 SHA256 89685620ee38c099b3621de2ef1e79b63ea2f8c2c73d333c1afb79068e971d14 SHA512 d1c793becadd24d7c941df3f5548dbd57d3c61151458e374fb5530a50e97d1041a8ba9ad43412c48a8e4672c01682f286064360b8fc2970cbc091861f47eb5bd WHIRLPOOL d4b269be01254412644fce2ab95aa2ca5cd8edebe8150f790fd5ae50fdc27c88444cccf641f6858e77358773497c11bd803d5c33d9cb0ced450e937299469c74
 DIST seamonkey-2.25-ca.xpi 815229 SHA256 ea59f8370f00ca40358ecdf489658316ffd44f58c75a3a2b0d4823b0b0a65a5e SHA512 fb7c43f6025656c9e7318f7a45e480f32fa355b8009f1b71b6749938a698ccbf6ab259603dc432d3a189b9017275db4a1478dc9f06d3677e5f6d503bcee67259 WHIRLPOOL e28d8d28c0dc7df54cc1972ecf190456e781d7f74bea28a9b740c93e28019ce134707858ba3a66f5e9c3d0a35c1be7910924287c6905e9aeb916abd4598da13e
@@ -27,3 +28,29 @@ DIST seamonkey-2.25-uk.xpi 852254 SHA256 b64369e2191eaa97fbb11a8e3e343cef42f3156
 DIST seamonkey-2.25-zh-CN.xpi 817701 SHA256 2e00de1f63e08914d954af80b6bd19552a268f566ca16de587ea673df4d6217c SHA512 7c6fd5bfc685e3f81d1636ba530cc9d9f27b549df30302c58557e0cb6271414c7678f96b8e47de37f4a58856cb45498d3a63366ec1b9de62991af76c2c52282a WHIRLPOOL d698015be75959c0dfd65d93c212cc5e2f6d439f21f61e6e94161f74230a12c67d7525cbcf92724183f7ba2bb2a51907ac66d55bc01e6b4b4401403eb1465e29
 DIST seamonkey-2.25-zh-TW.xpi 842075 SHA256 fc24d601697ee73d6cebb6bc06cc8b22e192716b343138834788d4ff7c9a1863 SHA512 13b8333aad9085f1ffbe42b1d9814e9012ff2191c0be757c8b116685f41750b94e0cb5ced1f8d3a5bf262d5ad7a13c60274f0d2243921699ced18884809dbff2 WHIRLPOOL 799d4a6a45c7137c0778f7db8f7c6157d8946dcc83da238ca2295a40d2f5e8d55ab80f9a8a8d9816b7fe88426bfac8aac7702385d12ad807b51fcb07cd4311f3
 DIST seamonkey-2.25.source.tar.bz2 155695615 SHA256 d99c19338737d75016561340c4bfa0087e13d055971579135eb205ae975c022a SHA512 4e326c36fa3e28b0aa6094f781f92a60175e12310cf5aee19d564d223c856d1321bafd979840dd90f318200aef80f62368bb96700ffe4ed0e5bf308951380726 WHIRLPOOL 6e369b5d084777d1e78657bc111fd43fe6df7cb667912e8fadef61981ad58d0548ebc39367183a11ed34e54513c14677dddba8eacae07cd2f2f23d4faa32b320
+DIST seamonkey-2.26-be.xpi 818751 SHA256 bba364903e2cd080a83b4c7b06317ce547fce0463e46cb1ff5241dcd3b0341f7 SHA512 c80819046b7fe6645738bdb4849a068e8e35698a5c530b63d29195b4ec2876956892711367e570c9464546bf8617ec1103195efabbc8949d32517bafde013622 WHIRLPOOL 50ab8395519f815d1ff214a32726bd1e46327d0cd95290ac7a1ed3897eb0f70f3b019807b4cf88d91905a853e911ced42f93267af26cd5b2546db7b68b18e173
+DIST seamonkey-2.26-ca.xpi 816735 SHA256 8885d0412bd420b77a831bc28aae685d0962ef840ddb16e380cd07a2f2ef176c SHA512 b6aef44fbf848a8240c28659c2d379d94f6053166424b9c46466e41a9df96a7917f9bc6deccb5d64d2c0362fedacdd3ce7be0704ab3e0c76c4cf45b3e1f30ff9 WHIRLPOOL 21b15cb74521f21489f47652fb660138d2796e0cf6da58c2e7122914a331131653737b9cff9b7503087c712ea71feaee5c35c5b82cfe626346adaebff1e1e094
+DIST seamonkey-2.26-cs.xpi 814944 SHA256 cc77420a27f8e0757bcbdd6f8df2be361883ae1c5840e63f63a1386e43bc498c SHA512 91dc46661d494762895ec66c76e804a22dad3854f8e1439807636721b0052790b4ef14aca360b0ec742fe5d10eb71c181e9707af62c335328a10d07d79e828da WHIRLPOOL 50ea7fd10ba9c12193e3d11400007e8a68297043979e7f8a5464b63d3e26289cf21345ac6eccc20d14da6884d8a46ca13d33415e48fc0c3b335858d912a75e76
+DIST seamonkey-2.26-de.xpi 822042 SHA256 960ce22067f7cd19ec30c1249a588c651785a8989f374e14e8d06de8dce35237 SHA512 054b312f5bd83750f6db8a4520a6bcd67d51b263c53e1eca9c8df37812095260d4576cea24437a47cc7f79801a025198e026546f94adeeae96b7b09212d7870e WHIRLPOOL 8f127568b35e62667fe508408b07dd2791b0f851c9150d1bc6e8946d88e682acbee4407051d84f123335215344e2abb48dba412b6f94eeca57b056eb49e95f2e
+DIST seamonkey-2.26-en-GB.xpi 785904 SHA256 42aa60112205d55fb9f835baf1a051da97942a950a17fbb37f0aac7cf6f5135e SHA512 e8ff828d9c62f1b4bbf192433a9aa86baa17b181a1dba903593199cf14ee22a81cd2119d69d8f8b40fa1c842ac561c5b1534748aac58537eb26393cd0759bf7b WHIRLPOOL 5e054c31ddcce50407f2e9d9fd137f202be40a1c6914fa6b2677cd83231fd7b747a37bad55367ecb5f46d14626d9f06e812bfd44340b4e16e4929985cde1c306
+DIST seamonkey-2.26-es-AR.xpi 836833 SHA256 70e3502d5578c3d793645c47872c436f92845800f5a74bcea3803b2c5db73dad SHA512 1b676c1bd5b195bf07c54c18af32cd6336881f74d34602f898b465f833afd82435c8ca4ef0c32b27a6fc0e53d8b59e342b7cc3fbebc521e89ca7d711f20dae2b WHIRLPOOL 96eb57fb2ff5df9636dc95c18dbcc3f9905ec6cbb93bc35f1f7fad99b7ff5d097f5d0b722199f4592cff569a8fee1c17212f1538689a25bf37c93f0024731183
+DIST seamonkey-2.26-es-ES.xpi 814002 SHA256 13bdb45b40c8a9b03f3c93aca5d120ce163a9dc263c68d9fa225826bf429c1a0 SHA512 2f09302a83ff0228d2b4e22ce8400e26cc75489b378151b5fc9a8c26585ead55d47d90f1ae04d53aecb14ad6232914ab1480bb449b0f7c99b45c77769abfe99a WHIRLPOOL 0e15f8d1c06a3c12817542ad3435cac7d5ccf4c732f0d2f7b02d08ef103cdff52a6cc6bc1509a04a567d55ec4152bb00df86c7243aba3649b021dfbc60cda72b
+DIST seamonkey-2.26-fi.xpi 784387 SHA256 f21cd2e898e11039b2909cad62a71e8f4ee769c68c5681d82300f95c9c70c00a SHA512 994e7c42ae12b8c271349d8bbacad810d9f63b4b2ff90eaef173ce42daa803e4bfa50fdde7d0ca9c4c7ccc91edd27efc0435a26791307b7aa4c222e2335a9d25 WHIRLPOOL 1f7e63f87e421cef681535c4bc7bc79354b2eab4557c07e842e7943ef33288f92a573eb8d3b1c33d6f924efc60094f7ba2eca82834f5a01aa1140ea796455b31
+DIST seamonkey-2.26-fr.xpi 795188 SHA256 4e892a84852f9d7470c7c7ff4cc6ff8da0cb5bc8e8197d41ca3105ded6d7356d SHA512 92b829f03892fc130258d58dec87410b825b3de28e1242c1ea8ad475a94bf94dbbdeee52b6d2c151f9db0323d4323f877d050fa0740f6e5bf97a3783e2fbe959 WHIRLPOOL 971444fdccb22e95b8fccd4803811664454c308195e8725f5c46b345e13b60af0951e4487b2ea55efff4905306294b2b216885c5b727e8afec94d9e12b9e7362
+DIST seamonkey-2.26-gl.xpi 794258 SHA256 de1db0aefa37fa6ce4ca2ab6ddbd53d4466e48cb435861270266ca0f56e338e0 SHA512 b13fa4db22457bd6023521d704ff542bcaf2c35383681bef0a102b4deb6011270cdedaeaf8f0eedc8800435e83b536f880aa2102c8618350ddeac166512041ca WHIRLPOOL 76f3decd68dd95cb213242b6276c59cccf749f5f88c72d7167629ca7abb8dc703041a250f65baaac540d225f268904cf662de3e92f311400c16e1b018da61176
+DIST seamonkey-2.26-hu.xpi 828526 SHA256 a1c8b084b6b64bb0b992e9a05c6fa49c9a5a48b437e86351b8a2ed1f2997f22c SHA512 97565d5a66568626c31fbe7038e107757f539746a3f5e167c24138f5cfb48b17b6db6336370a3583e2f417217fa33e8c70b74de2f73875ba37a1343f2329e191 WHIRLPOOL 03bc3bdbbb74b0e8dcd03f675743a1ee6441f7b87c3927e3485c3475ac82975c185a4451351a235ddc67a5d55a1895596e4d44f6bf619a4e434734599c747264
+DIST seamonkey-2.26-it.xpi 728566 SHA256 30dde81ae8bf1379caabc0a7e35bee72b8fa9fa052136de333dcbcd7f3ea550a SHA512 3fc510cc971b658953324021256045ad3fa70ffd25eb06a15aec14bc3b9bf55b565b85cd590515ead03a058a81f54e1ae8c9a7bbd2b4c1a9ffea1c5df782ed0a WHIRLPOOL 8de0ff54177d3267602f478afa506be71f225d035b4cd2ed67db78377e45eb015f7fcedb6a27bb5126b4afd98a510095c54d7453ef52bca9dfdc702abd26737a
+DIST seamonkey-2.26-ja.xpi 867575 SHA256 002743784937853e368c31ca5f80056eb50bd91dfa3f791164e388ab66e1e160 SHA512 084c32fe59c1de8df856308908b3333990341726a13594bf7bab6ad9cb6da0bdf0d569ccf3958143e38a141f1884497ae7fd70c96c940c7c7441602d684d2815 WHIRLPOOL e6304ea6b0850e000757c459dd5d9f032fec7222bd27abc71fe194887894481b642807ce1ca1437d3f5da35dcd91cbf1d609e61c1af8998e9fdffb38fff84066
+DIST seamonkey-2.26-lt.xpi 832068 SHA256 5beaf750798ffe4979e31e19dd88721df2819eeb4ac6cfb73388c0acecfb80f3 SHA512 bf809df4f42ec305f4b8e6357f70908f72a0ddc33a6075807c203273147d2296e34df4fa60ed9675697df988bb7aa3634335f14ed9eca7dc4534e56e8e1fd25a WHIRLPOOL 909c4f134f34a0f1efe70a8846cefb50c3d1c1c444081b6d4ebebf79ff99e1b3652630ca14db6664dab3a5299f16b75d872fa9c752edc31fa0b76842db928ffb
+DIST seamonkey-2.26-nb-NO.xpi 805527 SHA256 5559b7554f6683b7ad444af019d7ad75b13795f6669653b3be9c0934d12857a9 SHA512 8110c660430ecd7fe986ef83a2c9dac195b82034c4193bbb4c81e4b3605c87de258ad4770818661aacada28318a0c68ae704d7c41c57e503f443131281497e30 WHIRLPOOL 9bbce4692359f50698d5307caace84e40d56704bf54982665a93dbf1b15ea3b7d0e4fdc09aaa509edb6cc4a71f487284c08c0ef0d2d29843ee56bf3e1620c177
+DIST seamonkey-2.26-nl.xpi 781831 SHA256 794019b24058071a080b6450991fa79ca71a447df7702e6384785895fce18a34 SHA512 c03f1b0e1758891ee29c6bab2f0f0b01f3e6dff306f575d3af776cf04b006654c76f345391d327e4b0f56485ccfab215475988d42ed3c913b30cc825956735da WHIRLPOOL ca34644b178c2ab54ccaf1428230f087818262dfd95da4fe72cd041d03db82805d62e8a92e6dcf7da5a9f94f9606a94528e30fca31d4a38555b0fa2d557481b5
+DIST seamonkey-2.26-pl.xpi 855815 SHA256 fff16b9b77830bf983c49e42516091ec987a9616168d8040598799349b135e1f SHA512 9610c6dff661fe183c1e9a87c021fae62afc22bc53e3b158c818da7c660be88dbfce1dd7fc34d4f7fa6572322031769770538c7f47b9e504083e37b696dd2c46 WHIRLPOOL af1ed58c5500a28d86dcee5936b4a5a1ca85dc175f0d58cc9a7f1270b7a05ff092f0d240f8de8ff2b6a35b79e2ea3e76f8655529b2e0b8bc110d3d6295b649cc
+DIST seamonkey-2.26-pt-PT.xpi 817865 SHA256 35ecbc2df9c90227ce0e46d854237272d019ad4a5c54e459cdf82a601a9d52dd SHA512 9ff8519ff7258dd8b4cd56734c022b3454202400f11f2eff3f0f9bdfcad6bddd83f46843e368c6eb62ef8283a9dd9e7d48e2fa1ec183b848e0df20330ecdfb95 WHIRLPOOL 543bcca92877dc419c2fd8b73f0a7d646f6d9cc9091c58dc5916f47c7b3f7b44f479664a5c9e2643faed51f98543d92fad5bec46a725299c0c700463b1a988c0
+DIST seamonkey-2.26-ru.xpi 885692 SHA256 9c4c665da191538e1e836ecad5b4556f5a9ed4a4db94c4779db537dd2cef1c94 SHA512 3d3ddd334e4dbc289e920960c775003242c8cc0592e25795493a217b59819c19a43a6d3a357059b5987ccfdce2c7cf759d527b571ec4501b15e0af4ebb828561 WHIRLPOOL 2449d632ce0effda7510eb4b4243bc2a357677a826148ce84ac530180a546c3a4f51ea4cf0e80640882b580fdf3d3a12b7f47a9dcfd492e0e7b94be8bda6995d
+DIST seamonkey-2.26-sk.xpi 841872 SHA256 dca3c93b1b2131e58483a537961df44a044b80f5cc97fb2628b384f26e973212 SHA512 43d4174e3f1ceaf55e71d9ee593795074ad38b0cfac82f46438ff985d2c7a6ba609abaa4e46c36b390e92c4740e07f7d20b4e4df1ba448e4bd6a389bad2aefee WHIRLPOOL 91b4be48c460e32a9c2f929b2f3940437cde375e007b7200c463ce2a2f7bbc4df22eabe032d42512d2edb2451c092d28d55446b85a47df3827690397ef6da92b
+DIST seamonkey-2.26-sv-SE.xpi 809829 SHA256 e55f7d962db49d461b3b2cc2cc93da46da64139164b8d83f2e67df35bbfa2979 SHA512 fb6409fcd96fd04ac5010f8da40b5d6a62b5a034cfda777cc08cdb61a3b5940a6f7fd5f66b7abf5e0f1209d413fbd441251cc1ff1b73c86a8b7967ed19177bc7 WHIRLPOOL f4e429a9c6793aef2249bf8001d8e9492da4810337eb6998b8663684c062ff217b92953e765ac9225ba43c9a66a9cefb3800c23a4d429f3dc67f481eddc59901
+DIST seamonkey-2.26-tr.xpi 791385 SHA256 d4923efdc2d4e3a294b864c1fbb9fe0a9a9d0d3636cb4ebed2e2263fbabbe5fa SHA512 a3a393cab04f505b5aa4b3ec111114c05a17956f915510a7aeff396037d03627bed6fa522c3ee1d7ac7760486ff291cf49bb9172a0e8ef86e7acd0a7c70e69f8 WHIRLPOOL d8920793dbcc7ec352b68f004cc28a3c84f8063e6a62db1c9f773f05a2f66c2b717e4587af460ae375a6616707349d2fbf5f37eb372f12d8e311db1b27e10635
+DIST seamonkey-2.26-uk.xpi 853567 SHA256 ebdc37f591c32ddfe8783257c3944b6a44be15a2b10be4298326c187caddda81 SHA512 2430eba49aa8c3478c2a9a2888168b0e6b31132d4e4a81ee6cc2d61fd59373f91e2d9b2f20b0373c6566cd96bf7abcc5b8320b920cec8ba208d84dedadd2a3e3 WHIRLPOOL accc7e864c65228a681e805d50849e5e169f0b7dd39aa1a194afb28e9ad487cc4910a2d5d89d6b99074d5097eabd92b941a92f422b6901811341fbd4a35834a7
+DIST seamonkey-2.26-zh-CN.xpi 818845 SHA256 57ab3c518f60627b9cbbe57f5a25b22dace427ec9597d395953104732a5cf0fe SHA512 7703e06578c1820a45b57eda2e117d7e7ae8b8afdb3fe98980d5aec02d39f9e0b38e55546bd684b8fcce25b6ea5a4f43c0b5817fd6de93a6dc78d0f9c9ffbb35 WHIRLPOOL 314b41da8837753ebfd201d1c26f68b793c460069d370cf84105116f4c70f6d1076c6315a2bce2a24944ae34a41723138d437f936f082de16f82026caa77601b
+DIST seamonkey-2.26-zh-TW.xpi 843200 SHA256 2512be926be2859e16e058977e9dc31d29a3c8b92eefe5a6b3a6f304325cb7fe SHA512 456991409df15d7f8a71f9918cf493ffcc44a9d25477b3412d37e02e306e537621c0ac6222268b419f9450308fcb03949278c5c7e64a82e67a6690ce66cbf6e7 WHIRLPOOL 6885dc1813e350cecac3e32d9b0fc6402578ba6aa12879bb8531ca0afa2d1a7f682ccd6f9769f6cfd17473fd710ca452995b107a81804cbcd1da581ab8ee2a76
+DIST seamonkey-2.26.source.tar.bz2 165548355 SHA256 985262d39f38fc20d307e810c371c9f581f7c55a66cfabd6b5561c236116b874 SHA512 568fc2da523bdf584ca08cb45abf301fea7456dddc2822542154f496862a1a63d8e62bbc37ae189bd2d36698ff28b85b56fb55ca4811d1e5e86c72114b7a7f29 WHIRLPOOL b42f7221585ff6099d486b628ee39fb182f0587abe4333c7c941701d93dd94da2270bd6fe2422739197f1160edd3a59c951c6083174a13537b84417b8f50716e
diff --git a/www-client/seamonkey/files/pixman-supplement.patch b/www-client/seamonkey/files/pixman-supplement.patch
new file mode 100644
index 000000000000..776fcc1607ca
--- /dev/null
+++ b/www-client/seamonkey/files/pixman-supplement.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User Jan Beich <jbeich@tormail.org>
+# Date 1397136910 14400
+# Node ID c27f7537bc1b10e9127d8f7252657b7b2bf00db3
+# Parent  80a530af380d1a54004c4d6492052bf6a241d578
+Bug 993467 - Follow-up to bug 941595 to unbreak --with-system-pixman after bug 845874. r=Standard8
+CLOSED TREE
+
+diff --git a/config/config.mk b/config/config.mk
+--- a/config/config.mk
++++ b/config/config.mk
+@@ -402,17 +402,17 @@ TAR_CREATE_FLAGS = -chf
+ MY_CONFIG	:= $(DEPTH)/config/myconfig.mk
+ MY_RULES	:= $(DEPTH)/config/myrules.mk
+ 
+ #
+ # Default command macros; can be overridden in <arch>.mk.
+ #
+ CCC		= $(CXX)
+ 
+-OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
++OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
+ 
+ INCLUDES = \
+   $(LOCAL_INCLUDES) \
+   -I$(srcdir) \
+   -I. \
+   -I$(DIST)/include -I$(DIST)/include/nsprpub \
+   $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
+   $(OS_INCLUDES) \
+
diff --git a/www-client/seamonkey/seamonkey-2.26.ebuild b/www-client/seamonkey/seamonkey-2.26.ebuild
new file mode 100644
index 000000000000..ea7900e6a813
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.26.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/www-client/seamonkey/seamonkey-2.26.ebuild,v 1.1 2014/05/03 06:25:53 polynomial-c Exp $
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl
+	    pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	# And the langpack stuff stays at eclass defaults
+else
+	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+fi
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
+
+PATCHFF="firefox-29.0-patches-0.1"
+PATCH="${PN}-2.23-patches-01"
+EMVER="1.6.1_pre20140112"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+
+if [[ ${PV} == *_pre* ]] ; then
+	# pre-releases. No need for arch teams to change KEYWORDS here.
+
+	KEYWORDS=""
+else
+	# This is where arch teams should change the KEYWORDS.
+
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming selinux system-cairo system-icu system-jpeg system-sqlite test"
+
+SRC_URI="${SRC_URI}
+	${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	crypt? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}.tar.xz )"
+	#crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND=">=dev-libs/nss-3.16
+	>=dev-libs/nspr-4.10.4
+	>=dev-libs/glib-2.26:2
+	>=media-libs/mesa-7.10
+	>=media-libs/libpng-1.6.7[apng]
+	>=x11-libs/pango-1.14.0
+	>=x11-libs/gtk+-2.14:2
+	virtual/libffi
+	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
+	system-cairo? ( >=x11-libs/cairo-1.12[X] x11-libs/pixman )
+	system-icu? ( >=dev-libs/icu-51.1 )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.8.1:3[secure-delete,debug=] )
+	>=media-libs/libvpx-1.3.0
+	crypt? ( >=app-crypt/gnupg-1.4 )
+	kernel_linux? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	!elibc_glibc? ( dev-libs/libexecinfo )
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+if [[ ${PV} == *beta* ]] ; then
+	S="${WORKDIR}/comm-beta"
+else
+	S="${WORKDIR}/comm-release"
+fi
+
+BUILD_OBJ_DIR="${WORKDIR}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/seamonkey"
+
+	epatch "${FILESDIR}/pixman-supplement.patch"
+
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+	# drop -Wl,--build-id from LDFLAGS, bug #465466
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		#pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
+
+		#popd &>/dev/null || die
+	fi
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	local ms="${S}/mozilla"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd js/src || die
+	eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if use chatzilla ; then
+		MEXTENSIONS+=",irc"
+	else
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# We must force enable jemalloc 3 threw .mozconfig
+	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
+
+	mozconfig_annotate '' --enable-jemalloc
+	mozconfig_annotate '' --enable-replace-malloc
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gold
+
+	# Other sm-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+	mozconfig_annotate '' --enable-safe-browsing
+
+	mozconfig_use_enable gstreamer
+	mozconfig_use_enable pulseaudio
+	mozconfig_use_enable system-cairo
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_enable system-icu intl-api
+	# Feature is know to cause problems on hardened
+	mozconfig_use_enable jit ion
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
+		>> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if use crypt ; then
+		pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
+		# econf fails here and would produce useless Makefiles anyway
+		./configure || die
+		popd &>/dev/null || die
+	fi
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	mkdir -p ${BUILD_OBJ_DIR} && cd ${BUILD_OBJ_DIR} || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake -f "${S}/client.mk"
+
+	# Only build enigmail extension if conditions are met.
+	if use crypt ; then
+		cd "${S}"/mailnews/extensions/enigmail || die
+		emake
+		emake xpi
+	fi
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}/mozilla/dist/bin/xpcshell"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	if ! use libnotify ; then
+		echo 'pref("browser.download.manager.showAlertOnComplete", false);' \
+			>> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+			|| die
+	fi
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		"${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+	cp "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
+
+	if use crypt ; then
+		local em_dir="${S}/mailnews/extensions/enigmail/build"
+		pushd "${T}" &>/dev/null || die
+		unzip "${em_dir}"/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${em_dir}"/enigmail*.xpi || die
+
+		popd &>/dev/null || die
+	fi
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
+}
+
+pkg_preinst() {
+	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+}
+
+pkg_postinst() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/x11-drivers/radeon-ucode/Manifest b/x11-drivers/radeon-ucode/Manifest
index 4572e70aaf2d..89aa2803d208 100644
--- a/x11-drivers/radeon-ucode/Manifest
+++ b/x11-drivers/radeon-ucode/Manifest
@@ -1,3 +1,2 @@
-DIST radeon-ucode-20130826.tar.xz 452612 SHA256 713c83050ce3363638e73b836f04fb88d902052f5af07da1459089ef94a5f265 SHA512 ffdeeba36056d5cdb414b3e9883d4814b2c719d9394afcf51e62b042ed924b42f83a496326f301d579d27f922da3297e8cda8b78b9f5abf66961505aa8b0c3ef WHIRLPOOL a8bf47ecbbd651f44ebce8b35b3c8592e290ec0c47571ef831e5866a8c02352affebe8c1f9293b19d70716bb91719375af2f9f0f0e3d05ab71ac334d0593df63
-DIST radeon-ucode-20131111.tar.xz 469660 SHA256 81296d53114c4f791fbda5bb0e50b30926c14e95c40c5be0ca977fff5ad701ed SHA512 d2b9d1593af69866a9b016e938a9b634be9d4e32a24ecbb56506fd55caabad90e284874dcea258b8ea540379545bca4decee679677322bb8fc296dc1c3336ba2 WHIRLPOOL e2af092dc23302e6bed85d7d98f8b00413e066fa53489684da373e64e94f2a1e8b5cb9d873b285a17e1fd57711c773ad4ccdfa28e2dc0a463a5657f423b54e97
 DIST radeon-ucode-20140204.tar.xz 523300 SHA256 9e10b5c5dd052c9a2347b76d86a36f46b9aec568067aeba1bcff5b830f75a7c4 SHA512 c116f8612d0cc19fe8f117c42daba59132a04079e898e392f4661e302c7052229b4ced94be9627aa07e433fd9e07d9a9e538ee8004d5b261ec1e0ddad4abc7dc WHIRLPOOL d6483cca8cbc831f1590ce49a6d0685b2565a5d63a063a8b1c43929a5cc2027cd60009572c34c9889ce4ef3c4f6e23c263c672714bfaea35edf205c65bcbed83
+DIST radeon-ucode-20140430.tar.xz 531304 SHA256 a29fab53ac0ecca1775d0338f693954f9336911beaa32536fa6c70a21eefd06c SHA512 adb72e783a782242561fb036b58129b53b312ed1d58d6f05eca0725f3544ea41d3bd13cd712aa90b9cd0e95219c5789018c7a925d5045a253993442bed0a80c4 WHIRLPOOL 724455e7d5c2e48213b93e9ba3e310dbaa9863006e3ec05712be324b3efbf7b3d0d6ac6a20aafab771bf67ea35d291cfa505baa6f1e427393ea88149e3e771e3
diff --git a/x11-drivers/radeon-ucode/radeon-ucode-20130826.ebuild b/x11-drivers/radeon-ucode/radeon-ucode-20130826.ebuild
deleted file mode 100644
index f5c0cbf9c6e0..000000000000
--- a/x11-drivers/radeon-ucode/radeon-ucode-20130826.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/radeon-ucode-20130826.ebuild,v 1.3 2013/10/08 05:05:12 ago Exp $
-
-EAPI=5
-
-inherit linux-info
-
-DESCRIPTION="IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs"
-HOMEPAGE="http://people.freedesktop.org/~agd5f/radeon_ucode/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="radeon-ucode"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S=${WORKDIR}/${PN/-/_}
-
-src_install() {
-	insinto /lib/firmware/radeon
-	FILES=( *.bin )
-	doins ${FILES[@]} || die "doins failed"
-}
-
-pkg_postinst() {
-	if linux_config_exists && linux_chkconfig_builtin DRM_RADEON; then
-		if ! linux_chkconfig_present FIRMWARE_IN_KERNEL || \
-			! [[ "$(linux_chkconfig_string EXTRA_FIRMWARE)" == *_rlc.bin* ]]; then
-			ewarn "Your kernel has radeon DRM built-in but not the IRQ microcode."
-			ewarn "For kernel modesetting to work, please set in kernel config"
-			ewarn "CONFIG_FIRMWARE_IN_KERNEL=y"
-			ewarn "CONFIG_EXTRA_FIRMWARE_DIR=\"/lib/firmware\""
-			ewarn "CONFIG_EXTRA_FIRMWARE=\"${FILES[@]/#/radeon/}\""
-			ewarn "You may skip microcode files for which no hardware is installed."
-			ewarn "More information at http://wiki.gentoo.org/wiki/Radeon#Firmware"
-		fi
-	fi
-}
diff --git a/x11-drivers/radeon-ucode/radeon-ucode-20131111.ebuild b/x11-drivers/radeon-ucode/radeon-ucode-20140430.ebuild
similarity index 92%
rename from x11-drivers/radeon-ucode/radeon-ucode-20131111.ebuild
rename to x11-drivers/radeon-ucode/radeon-ucode-20140430.ebuild
index 04ee2b9e654a..7a6c070bdaef 100644
--- a/x11-drivers/radeon-ucode/radeon-ucode-20131111.ebuild
+++ b/x11-drivers/radeon-ucode/radeon-ucode-20140430.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-drivers/radeon-ucode/radeon-ucode-20131111.ebuild,v 1.1 2013/11/22 18:46:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/radeon-ucode-20140430.ebuild,v 1.1 2014/05/04 12:38:30 chithanh Exp $
 
 EAPI=5
 
diff --git a/x11-libs/cairo/cairo-1.12.16-r3.ebuild b/x11-libs/cairo/cairo-1.12.16-r3.ebuild
new file mode 100644
index 000000000000..9f439daf4a99
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.16-r3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v 1.1 2014/05/02 21:51:12 tetromino Exp $
+
+EAPI=5
+
+inherit check-reqs eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.28.0[${MULTILIB_USEDEP}]
+	directfb? ( dev-libs/DirectFB )
+	gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.28.6:2[${MULTILIB_USEDEP}] )
+	opengl? ( || ( media-libs/mesa[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+	openvg? ( media-libs/mesa[openvg,${MULTILIB_USEDEP}] )
+	qt4? ( >=dev-qt/qtgui-4.8:4 )
+	X? (
+		>=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		drm? (
+			>=virtual/udev-136[${MULTILIB_USEDEP}]
+			gallium? ( media-libs/mesa[gallium,${MULTILIB_USEDEP}] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	X? (
+		x11-proto/renderproto[${MULTILIB_USEDEP}]
+		drm? (
+			x11-proto/xproto[${MULTILIB_USEDEP}]
+			>=x11-proto/xextproto-7.1[${MULTILIB_USEDEP}]
+		)
+	)"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+	drm? ( X )
+	gallium? ( drm )
+	gles2? ( !opengl )
+	openvg? ( || ( gles2 opengl ) )
+	xlib-xcb? ( xcb )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cairo/cairo-features.h
+	/usr/include/cairo/cairo-directfb.h
+)
+
+CHECKREQS_MEMORY="768M"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
+		einfo "Checking for sufficient memory to build $PN with USE=lto"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
+		check-reqs_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+	# all-clipped handling from 1.13
+	epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-{1,2}.patch
+	# bug #507478, https://bugs.freedesktop.org/show_bug.cgi?id=77931
+	epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-3.patch
+
+	# allow the automagically injected -flto flag to be not injected
+	epatch "${FILESDIR}"/${PN}-1.12.16-lto-optional.patch
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	epatch_user
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# TODO: remove this (and add USE-dep) when DirectFB is converted,
+	# bug #484248 -- but beware of the circular dep.
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-directfb"
+	fi
+
+	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-qt"
+	fi
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable drm) \
+		$(use_enable directfb) \
+		$(use_enable gallium) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable lto) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		$(use_enable xlib-xcb) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		${myopts}
+}
+
+multilib_src_install() {
+	# parallel make install fails
+	emake -j1 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
+
+pkg_postinst() {
+	if use !xlib-xcb; then
+		if has_version net-misc/nxserver-freenx \
+				|| has_version net-misc/x2goserver; then
+			ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
+			ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
+			ewarn "applications that are running inside NX sessions. For details, see"
+			ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
+		fi
+	fi
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index d5531b58f83b..e5017b4c06ab 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.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/x11-libs/cairo/cairo-9999.ebuild,v 1.41 2014/05/02 09:51:49 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.42 2014/05/02 21:51:12 tetromino Exp $
 
 EAPI=5
 
-inherit eutils flag-o-matic autotools multilib-minimal
+inherit check-reqs eutils flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
@@ -20,7 +20,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
 # gtk-doc regeneration doesn't seem to work with out-of-source builds
 #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
 
@@ -86,10 +86,37 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/cairo/cairo-directfb.h
 )
 
+CHECKREQS_MEMORY="768M"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
+		einfo "Checking for sufficient memory to build $PN with USE=lto"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
+		check-reqs_pkg_setup
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
 	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
 	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+	# bug #507478, https://bugs.freedesktop.org/show_bug.cgi?id=77931
+	epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-3.patch
+
+	# allow the automagically injected -flto flag to be not injected
+	epatch "${FILESDIR}"/${PN}-1.12.16-lto-optional.patch
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
 	epatch_user
 
 	# Slightly messed build system YAY
@@ -139,6 +166,7 @@ multilib_src_configure() {
 		$(use_enable gallium) \
 		$(use_enable gles2 glesv2) \
 		$(use_enable glib gobject) \
+		$(use_enable lto) \
 		$(use_enable openvg vg) \
 		$(use_enable opengl gl) \
 		$(use_enable qt4 qt) \
diff --git a/x11-libs/cairo/files/cairo-1.12.16-all-clipped-1.patch b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-1.patch
new file mode 100644
index 000000000000..cef9e2928154
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-1.patch
@@ -0,0 +1,38 @@
+From 3b261bea7d8e8094ff3899aefab6bbc8628a3585 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 06 Mar 2014 08:34:10 +0000
+Subject: clip: Do not modify the special all-clipped cairo_clip_t
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75819
+---
+diff --git a/src/cairo-clip-boxes.c b/src/cairo-clip-boxes.c
+index bbb4197..352654f 100644
+--- a/src/cairo-clip-boxes.c
++++ b/src/cairo-clip-boxes.c
+@@ -173,7 +173,7 @@ _cairo_clip_intersect_rectangle_box (cairo_clip_t *clip,
+ 	    clip->extents = *r;
+ 	} else {
+ 	    if (! _cairo_rectangle_intersect (&clip->extents, r))
+-		clip = _cairo_clip_set_all_clipped (clip);
++		return _cairo_clip_set_all_clipped (clip);
+ 	}
+ 	if (clip->path == NULL)
+ 	    clip->is_region = _cairo_box_is_pixel_aligned (box);
+@@ -312,10 +312,12 @@ _cairo_clip_intersect_boxes (cairo_clip_t *clip,
+     _cairo_boxes_extents (boxes, &limits);
+ 
+     _cairo_box_round_to_rectangle (&limits, &extents);
+-    if (clip->path == NULL)
++    if (clip->path == NULL) {
+ 	clip->extents = extents;
+-    else if (! _cairo_rectangle_intersect (&clip->extents, &extents))
++    } else if (! _cairo_rectangle_intersect (&clip->extents, &extents)) {
+ 	clip = _cairo_clip_set_all_clipped (clip);
++	goto out;
++    }
+ 
+     if (clip->region) {
+ 	cairo_region_destroy (clip->region);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/cairo/files/cairo-1.12.16-all-clipped-2.patch b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-2.patch
new file mode 100644
index 000000000000..df537da1ab70
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-2.patch
@@ -0,0 +1,28 @@
+From ed175b2a2bebb6def85133257bc11a875d13b0dd Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Thu, 06 Mar 2014 08:45:08 +0000
+Subject: clip: Fix handling of special all-clipped cairo_clip_t
+
+_cairo_clip_intersect_box() wasn't checking if it was called with the special,
+read-only all-clipped clip and thus could have ended up writing to read-only
+memory.
+
+References: https://bugs.freedesktop.org/show_bug.cgi?id=75819
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+diff --git a/src/cairo-clip-boxes.c b/src/cairo-clip-boxes.c
+index 352654f..7bcbeb1 100644
+--- a/src/cairo-clip-boxes.c
++++ b/src/cairo-clip-boxes.c
+@@ -258,6 +258,9 @@ _cairo_clip_intersect_box (cairo_clip_t *clip,
+ {
+     cairo_rectangle_int_t r;
+ 
++    if (_cairo_clip_is_all_clipped (clip))
++	return clip;
++
+     _cairo_box_round_to_rectangle (box, &r);
+     if (r.width == 0 || r.height == 0)
+ 	return _cairo_clip_set_all_clipped (clip);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch
new file mode 100644
index 000000000000..98cd4d503d67
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch
@@ -0,0 +1,28 @@
+From 180fead4390089e56c28dba0fcfaa99d127722c1 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 1 23:39:01 PDT 2014
+Subject: [PATCH] segfault in cairo-xcb-surface-render.c
+
+http://lists.cairographics.org/archives/cairo/2014-May/025197.html
+https://bugs.freedesktop.org/show_bug.cgi?id=77931
+---
+ src/cairo-xcb-surface-render.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
+index 9625953..54307d5 100644
+--- a/src/cairo-xcb-surface-render.c
++++ b/src/cairo-xcb-surface-render.c
+@@ -3121,6 +3121,9 @@ _clip_and_composite_boxes (cairo_xcb_surface_t *dst,
+ 
+ 	clip = _cairo_clip_copy (extents->clip);
+ 	clip = _cairo_clip_intersect_boxes (clip, boxes);
++	if (_cairo_clip_is_all_clipped (clip))
++	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
++
+ 	status = _cairo_clip_get_polygon (clip, &polygon,
+ 					  &fill_rule, &antialias);
+ 	_cairo_clip_path_destroy (clip->path);
+-- 
+1.9.2
+
diff --git a/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch b/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch
new file mode 100644
index 000000000000..641cceaae99c
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch
@@ -0,0 +1,28 @@
+diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
+index f984eb2..15b3da2 100644
+--- a/build/configure.ac.warnings
++++ b/build/configure.ac.warnings
+@@ -38,13 +38,18 @@ dnl options.  Namely, the following:
+ 
+ dnl -flto working really needs a test link, not just a compile
+ 
+-safe_MAYBE_WARN="$MAYBE_WARN"
+-MAYBE_WARN="$MAYBE_WARN -flto"
+-AC_TRY_LINK([],[
++AC_ARG_ENABLE(lto,
++  AS_HELP_STRING([--disable-lto],
++                 [Do not try to use Link-Time Optimization]))
++if test "x$enable_lto" != "xno"; then
++  safe_MAYBE_WARN="$MAYBE_WARN"
++  MAYBE_WARN="$MAYBE_WARN -flto"
++  AC_TRY_LINK([],[
+ 	int main(int argc, char **argv) { return 0; }
+-],[],[
++  ],[],[
+ 	MAYBE_WARN="$safe_MAYBE_WARN"
+-])
++  ])
++fi
+ 
+ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index b41c8e361040..c5ad21464814 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -19,6 +19,9 @@
     <flag name="gles2">Use OpenGL ES 2 backend for acceleration.</flag>
     <flag name="glib">Compile with GLib Object System support</flag>
     <flag name="legacy-drivers">Include the buggy gradients patch (for legacy drivers, such as nvidia-drivers older than 304.30)</flag>
+	<flag name="lto">Try to build with Link-Time Optimization if supported by
+		the compiler. This is recommended by upstream, but can cause build
+		failure in some environments and on machines with little memory.</flag>
     <flag name="openvg">Use OpenVG for backend acceleration</flag>
     <flag name="valgrind">Built-in support to mark memory regions</flag>
     <flag name="xlib-xcb">Use XCB renderer backend for acceleration over xlib</flag>
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7-r1.ebuild
index cba7827dd5ab..30755a8bd966 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7-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-libs/gdk-pixbuf/gdk-pixbuf-2.30.7-r1.ebuild,v 1.3 2014/05/02 13:05:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7-r1.ebuild,v 1.5 2014/05/04 12:12:43 pacho Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/goffice/goffice-0.10.14.ebuild b/x11-libs/goffice/goffice-0.10.14.ebuild
index 4e241c664557..39bda874987a 100644
--- a/x11-libs/goffice/goffice-0.10.14.ebuild
+++ b/x11-libs/goffice/goffice-0.10.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/x11-libs/goffice/goffice-0.10.14.ebuild,v 1.1 2014/04/17 12:53:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.14.ebuild,v 1.3 2014/05/04 12:13:15 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://git.gnome.org/browse/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # Build fails with -gtk
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
index 616477312a78..cd4ab88d3746 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild,v 1.2 2014/05/02 13:06:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild,v 1.4 2014/05/04 12:12:57 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.mono-project.com/GtkGLArea"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-libs/libSM/libSM-1.2.2-r1.ebuild b/x11-libs/libSM/libSM-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..082fafe63727
--- /dev/null
+++ b/x11-libs/libSM/libSM-1.2.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.2-r1.ebuild,v 1.1 2014/05/03 07:33:11 mgorny Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Session Management library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc ipv6 +uuid"
+
+RDEPEND=">=x11-libs/libICE-1.0.5[${MULTILIB_USEDEP}]
+	x11-libs/xtrans
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+		uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
+	) ) )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local withuuid=$(use_with uuid libuuid)
+
+	# do not use uuid even if available in libc (like on FreeBSD)
+	use uuid || export ac_cv_func_uuid_create=no
+
+	if use uuid ; then
+		case ${CHOST} in
+			*-solaris*|*-darwin*)
+				if [[ ! -d ${EROOT}usr/include/uuid ]] &&
+					[[ -d ${ROOT}usr/include/uuid ]]
+				then
+					# Solaris and Darwin have uuid provided by the host
+					# system.  Since util-linux's version is based on this
+					# version, and on Darwin actually breaks host headers when
+					# installed, we can "pretend" for libSM we have libuuid
+					# installed, while in fact we don't
+					withuuid="--without-libuuid"
+					export HAVE_LIBUUID=yes
+					export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
+					# Darwin has uuid in libSystem
+					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
+				fi
+				;;
+		esac
+	fi
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		${withuuid}
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libmatewnck/libmatewnck-1.6.1.ebuild b/x11-libs/libmatewnck/libmatewnck-1.6.1.ebuild
index 8e901bd67e8d..8dd0277ba16f 100644
--- a/x11-libs/libmatewnck/libmatewnck-1.6.1.ebuild
+++ b/x11-libs/libmatewnck/libmatewnck-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/x11-libs/libmatewnck/libmatewnck-1.6.1.ebuild,v 1.3 2014/03/10 22:39:45 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatewnck/libmatewnck-1.6.1.ebuild,v 1.4 2014/05/04 14:55:27 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.mate-desktop.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="X +introspection startup-notification"
 
diff --git a/x11-misc/mate-menu-editor/mate-menu-editor-1.6.0.ebuild b/x11-misc/mate-menu-editor/mate-menu-editor-1.6.0.ebuild
index c20dcef751a0..3e4a1d070c36 100644
--- a/x11-misc/mate-menu-editor/mate-menu-editor-1.6.0.ebuild
+++ b/x11-misc/mate-menu-editor/mate-menu-editor-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mate-menu-editor/mate-menu-editor-1.6.0.ebuild,v 1.1 2014/03/19 16:34:15 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mate-menu-editor/mate-menu-editor-1.6.0.ebuild,v 1.2 2014/05/04 14:55:31 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 COMMON_DEPEND=">=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
 	>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.6.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.6.1.ebuild
index e0fe4306099d..47c2e9154f2a 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.6.1.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-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/x11-misc/mate-notification-daemon/mate-notification-daemon-1.6.1.ebuild,v 1.1 2014/03/19 16:50:58 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mate-notification-daemon/mate-notification-daemon-1.6.1.ebuild,v 1.2 2014/05/04 14:55:34 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-dekstop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/atk:0
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 42294869c3c7..94e8d2553552 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,4 @@
 DIST py3status-1.2.tar.gz 21351 SHA256 327afe46dbdaf60363d08618bc86f421afddcf71ef9fc7d67fb222183dbdea8f SHA512 6cb8e37b25d06d22e6f9d8ef31ca065b97c088daa0a4719201e74f48317f3e300c4e1a3b9eba989c333c1239cccbefe2f29642276e765ae64a8cd88848347db4 WHIRLPOOL f01c4f998c873e0044dd01ad962e4bc6ef2edc091efd10c3e825b1d73ba5f28fa187d6044500eddf7482d9ce2ab4d985282f977edb6b9fa0c6875c526f4522a0
 DIST py3status-1.3.tar.gz 21848 SHA256 84e8d3e65bcd93e384f3f99b38755d2861ba7158d335b1543f194015750ad59a SHA512 d7474afa16c44cdf7b7bfed7435f0d8fbeda62d655a6f468fe915ef8c7e31eda04afb6fbf9c512db2ca881352c5a98c2208f8cf89ef422b6d2402bdd822e92fe WHIRLPOOL bfbcd916c741452819c54961600313fa28e1200abecb34fd9026a8167b8e168588dcbb976f7a7fc13af0bb9e1f3280d4131f77f3e0f43578ee70df66f999eb91
 DIST py3status-1.4.tar.gz 22878 SHA256 cf1c202c44a3ea7515f2fad0fc61509dada8ec3dbec3228951a9a5fdbee8c106 SHA512 8e358f940bf63fe4d4385a1d36f8c01d832e17c74efc1729cf808c69000001783a6660fdedee62ad685f8b769f0c28c089ad430706bc227734504cccacc11f3b WHIRLPOOL 5866060b6720ca28851ef24137fad3acbd1eeca7fd3684140ff492f122fb925d01953630b8e6dc5594377d863d9359b268d80333a64c7e3fd36c5ae2e1570cf2
+DIST py3status-1.5.tar.gz 23163 SHA256 609cc9b533169ca63a7d34b44fbaafc92a235647ce04d8ec22f6710e395b63cd SHA512 b84ead3e255928e8e88dc3375f9b5bf149004580153927e14b12db7014ce519c1422124c42f30b6a472c4b595ea4141dabcf4dd62220b860515bb3f3293edf03 WHIRLPOOL 0a91acbf5c2b10b828c8de115872093ecaa166a6c6639832d619f92dcea7df602ff8b08d75f69257ab01b3fea1d5ac1c3c5661712b54285d88a26b91f88d3d55
diff --git a/x11-misc/py3status/py3status-1.5.ebuild b/x11-misc/py3status/py3status-1.5.ebuild
new file mode 100644
index 000000000000..d6ab28441213
--- /dev/null
+++ b/x11-misc/py3status/py3status-1.5.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/x11-misc/py3status/py3status-1.5.ebuild,v 1.1 2014/05/03 19:03:41 ultrabug Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+inherit distutils-r1
+
+MY_PN="py3status"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="py3status is an extensible i3status wrapper written in python"
+HOMEPAGE="https://github.com/ultrabug/py3status"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-misc/i3status"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/suxpanel/Manifest b/x11-misc/suxpanel/Manifest
deleted file mode 100644
index 654ba0a27d6a..000000000000
--- a/x11-misc/suxpanel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST suxpanel-0.4b.tar.bz2 86140 RMD160 fa709bafe7c4e92f3b83b0c867910d74efc698c8 SHA1 cb7e7d1e461667db95b777271f66956a77454584 SHA256 e2b3a2af3897595beff61cf563bc5506c5fd4c4ba3e3503b3124505031431060
diff --git a/x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch b/x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch
deleted file mode 100644
index 1f1f5750d347..000000000000
--- a/x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -1,7 +1,7 @@
- # ----------------------------------------------------------------------------
- 
--CC = gcc
--CFLAGS = -Wall $(GTK_CFLAGS) -O2 -g
-+CC ?= gcc
-+CFLAGS ?= -Wall $(GTK_CFLAGS) -O2 -g
- 
- # ----------------------------------------------------------------------------
- 
-@@ -11,13 +11,16 @@
- 	  mount.so mail.so showdesktop.so
- 
- all:	$(OBJECTS) $(MODULES)
--	$(CC) $(CFLAGS) -o suxpanel -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) $(GTK_FLAGS)
-+	$(CC) $(LDFLAGS) $(GTK_CFLAGS) $(CFLAGS) -o suxpanel -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS)
- 
- %.so: %.c 
- 	@echo "compile module: $< ($@)"
--	$(CC) $(CFLAGS) -o $@ -shared $< $(GTK_CFLAGS) $(GTK_LIBS) \
-+	$(CC) $(LDFLAGS) $(GTK_CFLAGS) $(CFLAGS) -fPIC -o $@ -shared $< $(GTK_LIBS) \
-             $(WNCK_LIBS) $(WNCK_CFLAGS)
- 
-+%.o: %.c
-+	$(CC) $(GTK_CFLAGS) $(WNCK_CFLAGS) $(CFLAGS) -c $< -o $@
-+
- clean:
- 	rm -rf *~ *.o *.so suxpanel
- 
diff --git a/x11-misc/suxpanel/files/suxpanel-0.4b-stdlib.patch b/x11-misc/suxpanel/files/suxpanel-0.4b-stdlib.patch
deleted file mode 100644
index 1e967512ec6e..000000000000
--- a/x11-misc/suxpanel/files/suxpanel-0.4b-stdlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur suxpanel-0.4b.orig/settings.c suxpanel-0.4b/settings.c
---- suxpanel-0.4b.orig/settings.c	2005-05-05 02:00:12.000000000 +0300
-+++ suxpanel-0.4b/settings.c	2008-04-03 19:15:08.000000000 +0300
-@@ -2,6 +2,7 @@
- #include "config.h"
- #include "settings.h"
- 
-+#include <stdlib.h>
- #include <string.h>
- #include <gdk/gdkkeysyms.h>
- #include <gtk/gtk.h>
diff --git a/x11-misc/suxpanel/metadata.xml b/x11-misc/suxpanel/metadata.xml
deleted file mode 100644
index 731225048652..000000000000
--- a/x11-misc/suxpanel/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>desktop-misc</herd>
-</pkgmetadata>
diff --git a/x11-misc/suxpanel/suxpanel-0.4b-r3.ebuild b/x11-misc/suxpanel/suxpanel-0.4b-r3.ebuild
deleted file mode 100644
index 53f6ae1baa8f..000000000000
--- a/x11-misc/suxpanel/suxpanel-0.4b-r3.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/x11-misc/suxpanel/suxpanel-0.4b-r3.ebuild,v 1.5 2012/05/05 04:53:53 jdhore Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="SuxPanel is a complete rewrite of MacOS Style Panel, a light-weight X11 desktop panel"
-HOMEPAGE="http://suxpanel.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libwnck:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stdlib.patch \
-		"${FILESDIR}"/${P}-makefile.patch
-
-	sed -i \
-		-e "s:share/${PN}/plugins:$(get_libdir)/${PN}/plugins:" \
-		Makefile.in suxpanel-install.sh || die
-}
-
-src_configure() {
-	use amd64 && append-flags -O0
-	tc-export CC
-	econf
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dobin suxpanel-install.sh || die
-	dodoc README || die
-}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.6.2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.6.2.ebuild
index e9469f7caf00..67941ca2ab1b 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.6.2.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.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/x11-terms/mate-terminal/mate-terminal-1.6.2.ebuild,v 1.1 2014/03/11 01:27:52 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mate-terminal/mate-terminal-1.6.2.ebuild,v 1.2 2014/05/04 14:55:39 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="app-text/rarian:0
 	dev-libs/atk:0
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.20.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.20.ebuild
index efadaf43b6f2..a476550bbe64 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.20.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.20.ebuild
@@ -1,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-terms/rxvt-unicode/rxvt-unicode-9.20.ebuild,v 1.2 2014/04/30 14:27:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.20.ebuild,v 1.4 2014/05/04 08:20:38 ago Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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"
+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"
 IUSE="
 	256-color alt-font-width blink buffer-on-clear +focused-urgency
 	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
diff --git a/x11-themes/mate-backgrounds/mate-backgrounds-1.6.1.ebuild b/x11-themes/mate-backgrounds/mate-backgrounds-1.6.1.ebuild
index fc306a2f55e1..c01487955b51 100644
--- a/x11-themes/mate-backgrounds/mate-backgrounds-1.6.1.ebuild
+++ b/x11-themes/mate-backgrounds/mate-backgrounds-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/x11-themes/mate-backgrounds/mate-backgrounds-1.6.1.ebuild,v 1.1 2014/03/11 01:39:53 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-backgrounds/mate-backgrounds-1.6.1.ebuild,v 1.2 2014/05/04 14:55:42 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=">=dev-util/intltool-0.35:*
 	sys-devel/gettext:*"
diff --git a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.6.0.ebuild b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.6.0.ebuild
index a244711ea7dc..e45a236da2ea 100644
--- a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.6.0.ebuild
+++ b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.6.0.ebuild,v 1.1 2014/03/19 17:21:41 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.6.0.ebuild,v 1.2 2014/05/04 14:55:50 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="minimal"
 
 RDEPEND="!minimal? ( >=x11-themes/mate-icon-theme-1.6:0 )
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.6.3.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.6.3.ebuild
index b31fd88d867a..f57b20b8df0d 100644
--- a/x11-themes/mate-icon-theme/mate-icon-theme-1.6.3.ebuild
+++ b/x11-themes/mate-icon-theme/mate-icon-theme-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/x11-themes/mate-icon-theme/mate-icon-theme-1.6.3.ebuild,v 1.3 2014/03/10 22:41:25 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-icon-theme/mate-icon-theme-1.6.3.ebuild,v 1.4 2014/05/04 14:55:46 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
 
diff --git a/x11-themes/mate-themes/mate-themes-1.6.3.ebuild b/x11-themes/mate-themes/mate-themes-1.6.3.ebuild
index e68b9c2ba1fb..e55a0317b088 100644
--- a/x11-themes/mate-themes/mate-themes-1.6.3.ebuild
+++ b/x11-themes/mate-themes/mate-themes-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/x11-themes/mate-themes/mate-themes-1.6.3.ebuild,v 1.1 2014/03/11 01:57:34 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-themes/mate-themes-1.6.3.ebuild,v 1.2 2014/05/04 14:55:54 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2:2
 	>=x11-libs/gtk+-2:2
diff --git a/x11-wm/enlightenment/enlightenment-0.17.6.ebuild b/x11-wm/enlightenment/enlightenment-0.17.6.ebuild
index 79a9f35f2379..47c462525bb2 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.6.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.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/x11-wm/enlightenment/enlightenment-0.17.6.ebuild,v 1.2 2014/04/21 08:17:48 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.6.ebuild,v 1.3 2014/05/04 11:13:42 zlogene Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ DESCRIPTION="Enlightenment DR17 window manager"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0.17/${PV%%_*}"
 
 # The @ is just an anchor to expand from
diff --git a/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild b/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild
index 939a499fa1a8..0cfe0938e2d8 100644
--- a/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild
+++ b/x11-wm/mate-window-manager/mate-window-manager-1.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/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild,v 1.3 2014/03/10 22:46:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild,v 1.4 2014/05/04 14:55:59 ago Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="startup-notification test xinerama"
 
 RDEPEND="