diff --git a/app-admin/kedpm/kedpm-0.4.0-r2.ebuild b/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
index ff271e70a1bd..4f26be80469a 100644
--- a/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
+++ b/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0-r2.ebuild,v 1.1 2014/12/15 05:18:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0-r2.ebuild,v 1.2 2015/02/19 09:04:28 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="gtk"
 
 DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
diff --git a/app-arch/dpkg/dpkg-1.17.23.ebuild b/app-arch/dpkg/dpkg-1.17.23.ebuild
index 2848a7608e63..e265281940bb 100644
--- a/app-arch/dpkg/dpkg-1.17.23.ebuild
+++ b/app-arch/dpkg/dpkg-1.17.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.23.ebuild,v 1.3 2015/02/13 21:16:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.23.ebuild,v 1.4 2015/02/19 09:02:46 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 +lzma nls selinux test unicode +update-alternatives +zlib"
 
 RDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
index c63bc33bd97a..f6119a485427 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild,v 1.19 2015/02/18 15:33:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild,v 1.20 2015/02/19 03:08:59 floppym Exp $
 
 EAPI=5
 
@@ -15,10 +15,10 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl nls unicode"
+IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
-	filecaps? ( sys-libs/libcap )
+	caps? ( sys-libs/libcap )
 	nls? ( virtual/libintl )
 	!app-cdr/cdrkit"
 DEPEND="${RDEPEND}
@@ -111,7 +111,7 @@ src_compile() {
 		fi
 	fi
 
-	if ! use filecaps; then
+	if ! use caps; then
 		CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
 	fi
 
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
index 15d03cf3a28e..68606ac9441f 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild,v 1.5 2015/02/18 15:33:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild,v 1.6 2015/02/19 03:08:59 floppym Exp $
 
 EAPI=5
 
@@ -15,10 +15,10 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl nls unicode"
+IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
-	filecaps? ( sys-libs/libcap )
+	caps? ( sys-libs/libcap )
 	nls? ( virtual/libintl )
 	!app-cdr/cdrkit"
 DEPEND="${RDEPEND}
@@ -218,7 +218,7 @@ src_compile() {
 		fi
 	fi
 
-	if ! use filecaps; then
+	if ! use caps; then
 		CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
 	fi
 
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
index 1233ef958e6b..656264834819 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild,v 1.2 2015/02/18 15:33:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild,v 1.3 2015/02/19 03:08:59 floppym Exp $
 
 EAPI=5
 
@@ -15,10 +15,10 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl nls unicode"
+IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
-	filecaps? ( sys-libs/libcap )
+	caps? ( sys-libs/libcap )
 	nls? ( virtual/libintl )
 	!app-cdr/cdrkit"
 DEPEND="${RDEPEND}
@@ -129,6 +129,9 @@ ac_cv_sizeof() {
 }
 
 src_configure() {
+	use acl || export ac_cv_header_sys_acl_h="no"
+	use caps || export ac_cv_lib_cap_cap_get_proc="no"
+
 	# skip obsolete configure script
 	if tc-is-cross-compiler ; then
 		# Cache known values for targets. #486680
@@ -218,14 +221,6 @@ src_compile() {
 		fi
 	fi
 
-	if ! use filecaps; then
-		CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
-	fi
-
-	if ! use acl; then
-		CFLAGS="${CFLAGS} -DNO_ACL"
-	fi
-
 	# If not built with -j1, "sometimes" cdda2wav will not be built.
 	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
 		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 058619aa1048..966f74aaf0c2 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1 +1,2 @@
 DIST cdw-0.7.1.tar.gz 771099 SHA256 6364c2b836bfe4bf3a672eee1eda2a32061e31d94f73abb02cd5f3e1b69a744e SHA512 8577281841ec3638157473004c835b17167e751594cf19a8960ab37bcad58179abbaa49da9ce37f841adbb79e0e75488d780dbfe348241b1f83a084a88dde205 WHIRLPOOL 58fdfd4e7375b3022a34e2ab6afc14625d3e7e24538069b0c6fd90ed645ba79d8d167d96c42204a1732095ebe8ea4b16d8e4321355cddd2d7a1fb8766ed3f806
+DIST cdw-0.8.0.tar.gz 849851 SHA256 8f5bd7ed41bc07a84c5aa693bed3c38420e60ba6a3b5ae6ff8e41d78a4665fd2 SHA512 67fd9e397800187baafff425fd77ae9ba679a7b396736004f305accea3c3c9ca215d70dac0410fd8ef9ed016f7ce11c3859c84bfa04e3234cee84201605175d0 WHIRLPOOL 1ad447f47bb8d1fdd5868aa0c6a5bba2f76d65aa93a7be6841823215794c094a25f8e03be6573b3d46256ad33e8d20185e5f790b3f1b5320623b74fd7a2eef6c
diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild
new file mode 100644
index 000000000000..21d156b1291b
--- /dev/null
+++ b/app-cdr/cdw/cdw-0.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-0.8.0.ebuild,v 1.2 2015/02/19 09:59:26 mr_bones_ Exp $
+
+EAPI=5
+DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
+HOMEPAGE="http://cdw.sourceforge.net"
+SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/cdrtools
+	app-cdr/dvd+rw-tools
+	dev-libs/libburn
+	dev-libs/libcdio[-minimal]
+	sys-libs/ncurses[unicode]"
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
+		default
+}
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index d21e7d9c9804..f849c8874a48 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-9999.ebuild,v 1.3 2012/01/20 18:45:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-9999.ebuild,v 1.4 2015/02/19 09:58:10 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
 ECVS_MODULE="cdw"
 ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
@@ -31,6 +31,6 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS cdw.conf
+	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
+		default
 }
diff --git a/app-crypt/pinentry/pinentry-0.9.0.ebuild b/app-crypt/pinentry/pinentry-0.9.0.ebuild
index 68df0e6abf2b..5a0eee4eb2c2 100644
--- a/app-crypt/pinentry/pinentry-0.9.0.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0.ebuild,v 1.2 2015/02/14 11:18:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0.ebuild,v 1.3 2015/02/19 09:07:33 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk ncurses qt4 caps static"
 
 RDEPEND="
diff --git a/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch b/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch
new file mode 100644
index 000000000000..70a47fd93fd5
--- /dev/null
+++ b/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch
@@ -0,0 +1,499 @@
+Created by: Karl Hakimian 
+Added by: Jesus Rivero <neurogeek@gentoo.org>
+Added on: Feb 18, 2015
+diff -rupN nvi-1.81.6.orig/common/api.c nvi-1.81.6/common/api.c
+--- nvi-1.81.6.orig/common/api.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/common/api.c	2015-02-17 11:04:50.199111784 -0800
+@@ -423,7 +423,7 @@ api_opts_get(SCR *sp, CHAR_T *name, char
+ 	switch (op->type) {
+ 	case OPT_0BOOL:
+ 	case OPT_1BOOL:
+-		MALLOC_RET(sp, *value, char *, STRLEN(op->name) + 2 + 1);
++		MALLOC_RET(sp, *value, char *, NVI_STRLEN(op->name) + 2 + 1);
+ 		(void)sprintf(*value,
+ 		    "%s"WS, O_ISSET(sp, offset) ? "" : "no", op->name);
+ 		if (boolvalue != NULL)
+diff -rupN nvi-1.81.6.orig/common/msg.c nvi-1.81.6/common/msg.c
+--- nvi-1.81.6.orig/common/msg.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/common/msg.c	2015-02-17 11:04:50.203891722 -0800
+@@ -378,7 +378,7 @@ msgq_wstr(SCR *sp, mtype_t mtype, CHAR_T
+ 		msgq(sp, mtype, fmt);
+ 		return;
+ 	}
+-	INT2CHAR(sp, str, STRLEN(str) + 1, nstr, nlen);
++	INT2CHAR(sp, str, NVI_STRLEN(str) + 1, nstr, nlen);
+ 	msgq_str(sp, mtype, nstr, fmt);
+ }
+ 
+diff -rupN nvi-1.81.6.orig/common/multibyte.h nvi-1.81.6/common/multibyte.h
+--- nvi-1.81.6.orig/common/multibyte.h	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/common/multibyte.h	2015-02-17 11:04:50.204262910 -0800
+@@ -12,7 +12,7 @@ typedef	wchar_t		CHAR_T;
+ typedef	u_int		UCHAR_T;
+ #define RCHAR_BIT	24
+ 
+-#define STRLEN		wcslen
++#define NVI_STRLEN		wcslen
+ #define STRTOL		wcstol
+ #define STRTOUL		wcstoul
+ #define SPRINTF		swprintf
+@@ -31,7 +31,7 @@ typedef	u_char		CHAR_T;
+ typedef	u_char		UCHAR_T;
+ #define RCHAR_BIT	CHAR_BIT
+ 
+-#define STRLEN		strlen
++#define NVI_STRLEN		strlen
+ #define STRTOL		strtol
+ #define STRTOUL		strtoul
+ #define SPRINTF		snprintf
+diff -rupN nvi-1.81.6.orig/common/options.c nvi-1.81.6/common/options.c
+--- nvi-1.81.6.orig/common/options.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/common/options.c	2015-02-17 11:04:50.195900457 -0800
+@@ -315,7 +315,7 @@ opts_init(SCR *sp, int *oargs)
+ 
+ 	/* Set numeric and string default values. */
+ #define	OI(indx, str) {							\
+-	a.len = STRLEN(str);						\
++	a.len = NVI_STRLEN(str);						\
+ 	if ((CHAR_T*)str != b2)	  /* GCC puts strings in text-space. */	\
+ 		(void)MEMCPY(b2, str, a.len+1);				\
+ 	if (opts_set(sp, argv, NULL)) {					\
+@@ -620,10 +620,10 @@ opts_set(SCR *sp, ARGS **argv, char *usa
+ 				goto badnum;
+ 			if ((nret =
+ 			    nget_uslong(sp, &value, sep, &endp, 10)) != NUM_OK) {
+-				INT2CHAR(sp, name, STRLEN(name) + 1, 
++				INT2CHAR(sp, name, NVI_STRLEN(name) + 1, 
+ 					     np, nlen);
+ 				p2 = msg_print(sp, np, &nf);
+-				INT2CHAR(sp, sep, STRLEN(sep) + 1, 
++				INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, 
+ 					     np, nlen);
+ 				t2 = msg_print(sp, np, &nf2);
+ 				switch (nret) {
+@@ -647,10 +647,10 @@ opts_set(SCR *sp, ARGS **argv, char *usa
+ 				break;
+ 			}
+ 			if (*endp && !ISBLANK(*endp)) {
+-badnum:				INT2CHAR(sp, name, STRLEN(name) + 1, 
++badnum:				INT2CHAR(sp, name, NVI_STRLEN(name) + 1, 
+ 					     np, nlen);
+ 				p2 = msg_print(sp, np, &nf);
+-				INT2CHAR(sp, sep, STRLEN(sep) + 1, 
++				INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, 
+ 					     np, nlen);
+ 				t2 = msg_print(sp, np, &nf2);
+ 				msgq(sp, M_ERR,
+@@ -680,7 +680,7 @@ badnum:				INT2CHAR(sp, name, STRLEN(nam
+ 				break;
+ 
+ 			/* Report to subsystems. */
+-			INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
++			INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, np, nlen);
+ 			if (op->func != NULL &&
+ 			    op->func(sp, spo, np, &value) ||
+ 			    ex_optchange(sp, offset, np, &value) ||
+@@ -712,7 +712,7 @@ badnum:				INT2CHAR(sp, name, STRLEN(nam
+ 			 * Do nothing if the value is unchanged, the underlying
+ 			 * functions can be expensive.
+ 			 */
+-			INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
++			INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, np, nlen);
+ 			if (!F_ISSET(op, OPT_ALWAYS) &&
+ 			    O_STR(sp, offset) != NULL &&
+ 			    !strcmp(O_STR(sp, offset), np))
+@@ -879,7 +879,7 @@ opts_dump(SCR *sp, enum optdisp type)
+ 		}
+ 		F_CLR(&sp->opts[cnt], OPT_SELECTED);
+ 
+-		curlen = STRLEN(op->name);
++		curlen = NVI_STRLEN(op->name);
+ 		switch (op->type) {
+ 		case OPT_0BOOL:
+ 		case OPT_1BOOL:
+@@ -1049,7 +1049,7 @@ opts_search(CHAR_T *name)
+ 	 * Check to see if the name is the prefix of one (and only one)
+ 	 * option.  If so, return the option.
+ 	 */
+-	len = STRLEN(name);
++	len = NVI_STRLEN(name);
+ 	for (found = NULL, op = optlist; op->name != NULL; ++op) {
+ 		if (op->name[0] < name[0])
+ 			continue;
+diff -rupN nvi-1.81.6.orig/dist/tags nvi-1.81.6/dist/tags
+--- nvi-1.81.6.orig/dist/tags	2007-11-18 08:43:55.000000000 -0800
++++ nvi-1.81.6/dist/tags	2015-02-17 11:04:50.225314084 -0800
+@@ -1068,8 +1068,8 @@ SPRINTF	../common/multibyte.h	37;"	d
+ STANDARD_TAB	../common/key.h	213;"	d
+ STRCMP	../common/multibyte.h	19;"	d
+ STRCMP	../common/multibyte.h	38;"	d
+-STRLEN	../common/multibyte.h	15;"	d
+-STRLEN	../common/multibyte.h	34;"	d
++NVI_STRLEN	../common/multibyte.h	15;"	d
++NVI_STRLEN	../common/multibyte.h	34;"	d
+ STRPBRK	../common/multibyte.h	20;"	d
+ STRPBRK	../common/multibyte.h	39;"	d
+ STRSET	../common/multibyte.h	22;"	d
+diff -rupN nvi-1.81.6.orig/ex/ex_argv.c nvi-1.81.6/ex/ex_argv.c
+--- nvi-1.81.6.orig/ex/ex_argv.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/ex/ex_argv.c	2015-02-17 11:04:50.267171388 -0800
+@@ -217,7 +217,7 @@ argv_exp2(SCR *sp, EXCMD *excp, CHAR_T *
+ 
+ 			*p = '\0';
+ 			INT2CHAR(sp, bp + SHELLOFFSET, 
+-				 STRLEN(bp + SHELLOFFSET) + 1, np, nlen);
++				 NVI_STRLEN(bp + SHELLOFFSET) + 1, np, nlen);
+ 			d = strdup(np);
+ 			rval = argv_lexp(sp, excp, d);
+ 			free (d);
+@@ -332,7 +332,7 @@ argv_fexp(SCR *sp, EXCMD *excp, CHAR_T *
+ 				    "115|No previous command to replace \"!\"");
+ 				return (1);
+ 			}
+-			len += tlen = STRLEN(exp->lastbcomm);
++			len += tlen = NVI_STRLEN(exp->lastbcomm);
+ 			off = p - bp;
+ 			ADD_SPACE_RETW(sp, bp, blen, len);
+ 			p = bp + off;
+@@ -683,7 +683,7 @@ err:		if (ifp != NULL)
+ 		 * XXX
+ 		 * Assume that all shells have -c.
+ 		 */
+-		INT2CHAR(sp, bp, STRLEN(bp)+1, np, nlen);
++		INT2CHAR(sp, bp, NVI_STRLEN(bp)+1, np, nlen);
+ 		execl(sh_path, sh, "-c", np, (char *)NULL);
+ 		msgq_str(sp, M_SYSERR, sh_path, "118|Error: execl: %s");
+ 		_exit(127);
+diff -rupN nvi-1.81.6.orig/ex/ex_cscope.c nvi-1.81.6/ex/ex_cscope.c
+--- nvi-1.81.6.orig/ex/ex_cscope.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/ex/ex_cscope.c	2015-02-17 11:04:50.261539058 -0800
+@@ -140,7 +140,7 @@ ex_cscope(SCR *sp, EXCMD *cmdp)
+ 		for (; *p && isspace(*p); ++p);
+ 	}
+ 
+-	INT2CHAR(sp, cmd, STRLEN(cmd) + 1, np, nlen);
++	INT2CHAR(sp, cmd, NVI_STRLEN(cmd) + 1, np, nlen);
+ 	if ((ccp = lookup_ccmd(np)) == NULL) {
+ usage:		msgq(sp, M_ERR, "309|Use \"cscope help\" for help");
+ 		return (1);
+@@ -214,7 +214,7 @@ cscope_add(SCR *sp, EXCMD *cmdp, CHAR_T
+ 	 * >1 additional args: object, too many args.
+ 	 */
+ 	cur_argc = cmdp->argc;
+-	if (argv_exp2(sp, cmdp, dname, STRLEN(dname))) {
++	if (argv_exp2(sp, cmdp, dname, NVI_STRLEN(dname))) {
+ 		return (1);
+ 	}
+ 	if (cmdp->argc == cur_argc) {
+@@ -228,7 +228,7 @@ cscope_add(SCR *sp, EXCMD *cmdp, CHAR_T
+ 		return (1);
+ 	}
+ 
+-	INT2CHAR(sp, dname, STRLEN(dname)+1, np, nlen);
++	INT2CHAR(sp, dname, NVI_STRLEN(dname)+1, np, nlen);
+ 
+ 	/*
+ 	 * The user can specify a specific file (so they can have multiple
+@@ -471,7 +471,7 @@ cscope_find(SCR *sp, EXCMD *cmdp, CHAR_T
+ 	}
+ 
+ 	/* Create the cscope command. */
+-	INT2CHAR(sp, pattern, STRLEN(pattern) + 1, np, nlen);
++	INT2CHAR(sp, pattern, NVI_STRLEN(pattern) + 1, np, nlen);
+ 	np = strdup(np);
+ 	if ((tqp = create_cs_cmd(sp, np, &search)) == NULL)
+ 		goto err;
+@@ -801,7 +801,7 @@ cscope_help(SCR *sp, EXCMD *cmdp, CHAR_T
+ 	char *np;
+ 	size_t nlen;
+ 
+-	INT2CHAR(sp, subcmd, STRLEN(subcmd) + 1, np, nlen);
++	INT2CHAR(sp, subcmd, NVI_STRLEN(subcmd) + 1, np, nlen);
+ 	return (csc_help(sp, np));
+ }
+ 
+@@ -842,7 +842,7 @@ cscope_kill(SCR *sp, EXCMD *cmdp, CHAR_T
+ 	char *np;
+ 	size_t nlen;
+ 
+-	INT2CHAR(sp, cn, STRLEN(cn) + 1, np, nlen);
++	INT2CHAR(sp, cn, NVI_STRLEN(cn) + 1, np, nlen);
+ 	return (terminate(sp, NULL, atoi(np)));
+ }
+ 
+diff -rupN nvi-1.81.6.orig/ex/ex_filter.c nvi-1.81.6/ex/ex_filter.c
+--- nvi-1.81.6.orig/ex/ex_filter.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/ex/ex_filter.c	2015-02-17 11:04:50.263257613 -0800
+@@ -138,7 +138,7 @@ err:		if (input[0] != -1)
+ 		else
+ 			++name;
+ 
+-		INT2SYS(sp, cmd, STRLEN(cmd)+1, np, nlen);
++		INT2SYS(sp, cmd, NVI_STRLEN(cmd)+1, np, nlen);
+ 		execl(O_STR(sp, O_SHELL), name, "-c", np, (char *)NULL);
+ 		msgq_str(sp, M_SYSERR, O_STR(sp, O_SHELL), "execl: %s");
+ 		_exit (127);
+@@ -283,7 +283,7 @@ err:		if (input[0] != -1)
+ 	 * Ignore errors on vi file reads, to make reads prettier.  It's
+ 	 * completely inconsistent, and historic practice.
+ 	 */
+-uwait:	INT2CHAR(sp, cmd, STRLEN(cmd) + 1, np, nlen);
++uwait:	INT2CHAR(sp, cmd, NVI_STRLEN(cmd) + 1, np, nlen);
+ 	return (proc_wait(sp, (long)utility_pid, np,
+ 	    ftype == FILTER_READ && F_ISSET(sp, SC_VI) ? 1 : 0, 0) || rval);
+ }
+diff -rupN nvi-1.81.6.orig/ex/ex_init.c nvi-1.81.6/ex/ex_init.c
+--- nvi-1.81.6.orig/ex/ex_init.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/ex/ex_init.c	2015-02-17 11:04:50.279419412 -0800
+@@ -61,7 +61,7 @@ ex_screen_copy(SCR *orig, SCR *sp)
+ 
+ 		if (oexp->lastbcomm != NULL &&
+ 		    (nexp->lastbcomm = v_wstrdup(sp, oexp->lastbcomm, 
+-				     STRLEN(oexp->lastbcomm))) == NULL) {
++				     NVI_STRLEN(oexp->lastbcomm))) == NULL) {
+ 			msgq(sp, M_SYSERR, NULL);
+ 			return(1);
+ 		}
+diff -rupN nvi-1.81.6.orig/ex/ex_tag.c nvi-1.81.6/ex/ex_tag.c
+--- nvi-1.81.6.orig/ex/ex_tag.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/ex/ex_tag.c	2015-02-17 11:04:50.275254557 -0800
+@@ -68,7 +68,7 @@ ex_tag_first(SCR *sp, CHAR_T *tagarg)
+ 
+ 	/* Build an argument for the ex :tag command. */
+ 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
+-	argv_exp0(sp, &cmd, tagarg, STRLEN(tagarg));
++	argv_exp0(sp, &cmd, tagarg, NVI_STRLEN(tagarg));
+ 
+ 	/*
+ 	 * XXX
+@@ -115,7 +115,7 @@ ex_tag_push(SCR *sp, EXCMD *cmdp)
+ 
+ 		/* Taglength may limit the number of characters. */
+ 		if ((tl =
+-		    O_VAL(sp, O_TAGLENGTH)) != 0 && STRLEN(exp->tag_last) > tl)
++		    O_VAL(sp, O_TAGLENGTH)) != 0 && NVI_STRLEN(exp->tag_last) > tl)
+ 			exp->tag_last[tl] = '\0';
+ 		break;
+ 	case 0:
+@@ -587,7 +587,7 @@ ex_tag_copy(SCR *orig, SCR *sp)
+ 	/* Copy the last tag. */
+ 	if (oexp->tag_last != NULL &&
+ 	    (nexp->tag_last = v_wstrdup(sp, oexp->tag_last, 
+-					STRLEN(oexp->tag_last))) == NULL) {
++					NVI_STRLEN(oexp->tag_last))) == NULL) {
+ 		msgq(sp, M_SYSERR, NULL);
+ 		return (1);
+ 	}
+@@ -997,7 +997,7 @@ ctag_slist(SCR *sp, CHAR_T *tag)
+ 	exp = EXP(sp);
+ 
+ 	/* Allocate and initialize the tag queue structure. */
+-	INT2CHAR(sp, tag, STRLEN(tag) + 1, np, nlen);
++	INT2CHAR(sp, tag, NVI_STRLEN(tag) + 1, np, nlen);
+ 	len = nlen - 1;
+ 	CALLOC_GOTO(sp, tqp, TAGQ *, 1, sizeof(TAGQ) + len + 1);
+ 	CIRCLEQ_INIT(&tqp->tagq);
+diff -rupN nvi-1.81.6.orig/ex/ex_util.c nvi-1.81.6/ex/ex_util.c
+--- nvi-1.81.6.orig/ex/ex_util.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/ex/ex_util.c	2015-02-17 11:04:50.268378054 -0800
+@@ -153,7 +153,7 @@ ex_wemsg(SCR* sp, CHAR_T *p, exm_t which
+ 	char *np;
+ 	size_t nlen;
+ 
+-	if (p) INT2CHAR(sp, p, STRLEN(p), np, nlen);
++	if (p) INT2CHAR(sp, p, NVI_STRLEN(p), np, nlen);
+ 	else np = NULL;
+ 	ex_emsg(sp, np, which);
+ }
+diff -rupN nvi-1.81.6.orig/ex/ex_write.c nvi-1.81.6/ex/ex_write.c
+--- nvi-1.81.6.orig/ex/ex_write.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/ex/ex_write.c	2015-02-17 11:04:50.277249383 -0800
+@@ -158,7 +158,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
+ 			ex_emsg(sp, cmdp->cmd->usage, EXM_USAGE);
+ 			return (1);
+ 		}
+-		if (argv_exp1(sp, cmdp, p, STRLEN(p), 1))
++		if (argv_exp1(sp, cmdp, p, NVI_STRLEN(p), 1))
+ 			return (1);
+ 
+ 		/*
+@@ -203,7 +203,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
+ 		    &cmdp->addr1, &cmdp->addr2, NULL, flags));
+ 
+ 	/* Build an argv so we get an argument count and file expansion. */
+-	if (argv_exp2(sp, cmdp, p, STRLEN(p)))
++	if (argv_exp2(sp, cmdp, p, NVI_STRLEN(p)))
+ 		return (1);
+ 
+ 	/*
+@@ -255,7 +255,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
+ 			set_alt_name(sp, name);
+ 		break;
+ 	default:
+-		INT2CHAR(sp, p, STRLEN(p) + 1, n, nlen);
++		INT2CHAR(sp, p, NVI_STRLEN(p) + 1, n, nlen);
+ 		ex_emsg(sp, n, EXM_FILECOUNT);
+ 		return (1);
+ 	}
+diff -rupN nvi-1.81.6.orig/ip/ip_term.c nvi-1.81.6/ip/ip_term.c
+--- nvi-1.81.6.orig/ip/ip_term.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/ip/ip_term.c	2015-02-17 11:04:50.280203225 -0800
+@@ -127,7 +127,7 @@ ip_optchange(SCR *sp, int offset, char *
+ 
+ 	ipb.code = SI_EDITOPT;
+ 	ipb.str1 = (char*)opt->name;
+-	ipb.len1 = STRLEN(opt->name) * sizeof(CHAR_T);
++	ipb.len1 = NVI_STRLEN(opt->name) * sizeof(CHAR_T);
+ 
+ 	(void)vi_send(ipp->o_fd, "ab1", &ipb);
+ 	return (0);
+diff -rupN nvi-1.81.6.orig/perl_api/perl.xs nvi-1.81.6/perl_api/perl.xs
+--- nvi-1.81.6.orig/perl_api/perl.xs	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/perl_api/perl.xs	2015-02-17 11:04:50.189684363 -0800
+@@ -326,7 +326,7 @@ perl_ex_perl(scrp, cmdp, cmdlen, f_lno,
+ 	newVIrv(pp->svid, scrp);
+ 
+ 	istat = signal(SIGINT, my_sighandler);
+-	INT2CHAR(scrp, cmdp, STRLEN(cmdp)+1, np, nlen);
++	INT2CHAR(scrp, cmdp, NVI_STRLEN(cmdp)+1, np, nlen);
+ 	perl_eval(np);
+ 	signal(SIGINT, istat);
+ 
+@@ -421,7 +421,7 @@ perl_ex_perldo(scrp, cmdp, cmdlen, f_lno
+ 	/* Backwards compatibility. */
+ 	newVIrv(pp->svid, scrp);
+ 
+-	INT2CHAR(scrp, cmdp, STRLEN(cmdp)+1, np, nlen);
++	INT2CHAR(scrp, cmdp, NVI_STRLEN(cmdp)+1, np, nlen);
+ 	if (!(command = malloc(length = nlen - 1 + sizeof("sub {}"))))
+ 		return 1;
+ 	snprintf(command, length, "sub {%s}", np);
+diff -rupN nvi-1.81.6.orig/regex/engine.c nvi-1.81.6/regex/engine.c
+--- nvi-1.81.6.orig/regex/engine.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/regex/engine.c	2015-02-17 11:04:50.181456859 -0800
+@@ -161,7 +161,7 @@ int eflags;
+ 		stop = string + pmatch[0].rm_eo;
+ 	} else {
+ 		start = string;
+-		stop = start + STRLEN(start);
++		stop = start + NVI_STRLEN(start);
+ 	}
+ 	if (stop < start)
+ 		return(REG_INVARG);
+diff -rupN nvi-1.81.6.orig/regex/regcomp.c nvi-1.81.6/regex/regcomp.c
+--- nvi-1.81.6.orig/regex/regcomp.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/regex/regcomp.c	2015-02-17 11:04:50.175705539 -0800
+@@ -198,7 +198,7 @@ regcomp(regex_t *preg, const RCHAR_T *pa
+ 			return(REG_INVARG);
+ 		len = preg->re_endp - pattern;
+ 	} else
+-		len = STRLEN(pattern);
++		len = NVI_STRLEN(pattern);
+ 
+ 	/* do the mallocs early so failure handling is easy */
+ 	g = (struct re_guts *)malloc(sizeof(struct re_guts) +
+@@ -818,7 +818,7 @@ p_b_cclass(register struct parse *p, reg
+ 		NEXT();
+ 	len = p->next - sp;
+ 	for (cp = cclasses; cp->name != NULL; cp++)
+-		if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
++		if (NVI_STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
+ 			break;
+ 	if (cp->name == NULL) {
+ 		/* oops, didn't find it */
+@@ -889,7 +889,7 @@ p_b_coll_elem(register struct parse *p,
+ 	}
+ 	len = p->next - sp;
+ 	for (cp = cnames; cp->name != NULL; cp++)
+-		if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
++		if (NVI_STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
+ 			return(cp->code);	/* known name */
+ 	if (len == 1)
+ 		return(*sp);	/* single character */
+diff -rupN nvi-1.81.6.orig/vi/v_event.c nvi-1.81.6/vi/v_event.c
+--- nvi-1.81.6.orig/vi/v_event.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/vi/v_event.c	2015-02-17 11:04:50.242966563 -0800
+@@ -97,7 +97,7 @@ v_editopt(SCR *sp, VICMD *vp)
+ 	size_t nlen;
+ 	char *p2;
+ 
+-	INT2CHAR(sp, vp->ev.e_str2, STRLEN(vp->ev.e_str2)+1, np, nlen);
++	INT2CHAR(sp, vp->ev.e_str2, NVI_STRLEN(vp->ev.e_str2)+1, np, nlen);
+ 	p2 = strdup(np);
+ 	rval = api_opts_set(sp, vp->ev.e_str1, p2, 
+ 			    vp->ev.e_val1, vp->ev.e_val1);
+@@ -135,7 +135,7 @@ v_tag(SCR *sp, VICMD *vp)
+ 		return (1);
+ 
+ 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
+-	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw));
++	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw));
+ 	return (v_exec_ex(sp, vp, &cmd));
+ }
+ 
+@@ -167,7 +167,7 @@ v_tagsplit(SCR *sp, VICMD *vp)
+ 
+ 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
+ 	F_SET(&cmd, E_NEWSCREEN);
+-	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw));
++	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw));
+ 	return (v_exec_ex(sp, vp, &cmd));
+ }
+ 
+diff -rupN nvi-1.81.6.orig/vi/v_ex.c nvi-1.81.6/vi/v_ex.c
+--- nvi-1.81.6.orig/vi/v_ex.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/vi/v_ex.c	2015-02-17 11:04:50.246380280 -0800
+@@ -210,7 +210,7 @@ v_tagpush(SCR *sp, VICMD *vp)
+ 	EXCMD cmd;
+ 
+ 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, 0, 0);
+-	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw) + 1);
++	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw) + 1);
+ 	return (v_exec_ex(sp, vp, &cmd));
+ }
+ 
+diff -rupN nvi-1.81.6.orig/vi/vs_msg.c nvi-1.81.6/vi/vs_msg.c
+--- nvi-1.81.6.orig/vi/vs_msg.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/vi/vs_msg.c	2015-02-17 11:04:50.251093618 -0800
+@@ -175,7 +175,7 @@ vs_update(SCR *sp, const char *m1, const
+ 	 */
+ 	if (F_ISSET(sp, SC_SCR_EXWROTE)) {
+ 		if (m2 != NULL)
+-			INT2CHAR(sp, m2, STRLEN(m2) + 1, np, nlen);
++			INT2CHAR(sp, m2, NVI_STRLEN(m2) + 1, np, nlen);
+ 		(void)ex_printf(sp,
+ 		    "%s\n", m1 == NULL? "" : m1, m2 == NULL ? "" : np);
+ 		(void)ex_fflush(sp);
+@@ -203,7 +203,7 @@ vs_update(SCR *sp, const char *m1, const
+ 	} else
+ 		len = 0;
+ 	if (m2 != NULL) {
+-		mlen = STRLEN(m2);
++		mlen = NVI_STRLEN(m2);
+ 		if (len + mlen > sp->cols - 2)
+ 			mlen = (sp->cols - 2) - len;
+ 		(void)gp->scr_waddstr(sp, m2, mlen);
+diff -rupN nvi-1.81.6.orig/vi/vs_split.c nvi-1.81.6/vi/vs_split.c
+--- nvi-1.81.6.orig/vi/vs_split.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/vi/vs_split.c	2015-02-17 11:04:50.256136584 -0800
+@@ -628,7 +628,7 @@ vs_fg(SCR *sp, SCR **nspp, CHAR_T *name,
+ 	wp = sp->wp;
+ 
+ 	if (name)
+-	    INT2CHAR(sp, name, STRLEN(name) + 1, np, nlen);
++	    INT2CHAR(sp, name, NVI_STRLEN(name) + 1, np, nlen);
+ 	else
+ 	    np = NULL;
+ 	if (newscreen)
+diff -rupN nvi-1.81.6.orig/vi/v_txt.c nvi-1.81.6/vi/v_txt.c
+--- nvi-1.81.6.orig/vi/v_txt.c	2007-11-18 08:41:42.000000000 -0800
++++ nvi-1.81.6/vi/v_txt.c	2015-02-17 11:04:50.240596567 -0800
+@@ -2049,7 +2049,7 @@ retry:		for (len = 0,
+ 		return (0);
+ 	case 1:				/* One match. */
+ 		/* If something changed, do the exchange. */
+-		nlen = STRLEN(cmd.argv[0]->bp);
++		nlen = NVI_STRLEN(cmd.argv[0]->bp);
+ 		if (len != nlen || MEMCMP(cmd.argv[0]->bp, p, len))
+ 			break;
+ 
diff --git a/app-editors/nvi/nvi-1.81.6-r5.ebuild b/app-editors/nvi/nvi-1.81.6-r5.ebuild
new file mode 100644
index 000000000000..e7a84b275308
--- /dev/null
+++ b/app-editors/nvi/nvi-1.81.6-r5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r5.ebuild,v 1.1 2015/02/19 02:45:24 neurogeek Exp $
+
+EAPI=4
+
+inherit autotools db-use eutils flag-o-matic
+
+DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
+DBSLOTS=
+DBDEPENDS=
+for DBVER in ${DBVERS}
+do
+	if [[ ${DBVER} = *.*.* ]]; then
+		DBSLOTS="${DBSLOTS} ${DBVER%.*}"
+		DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}"
+	else
+		DBSLOTS="${DBSLOTS} ${DBVER}"
+		DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}"
+	fi
+done
+
+DESCRIPTION="Vi clone"
+HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
+SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="perl tcl unicode"
+
+CDEPEND="|| ( ${DBDEPENDS} )
+	>=sys-libs/ncurses-5.6-r2
+	perl? ( dev-lang/perl )
+	tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) )"
+
+DEPEND="${CDEPEND}
+		virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	app-admin/eselect-vi"
+
+REQUIRED_USE="tcl? ( !unicode )"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${P}-strlen-macro-renaming.patch
+	epatch "${FILESDIR}"/${P}-db44.patch
+	epatch "${FILESDIR}"/${P}-db.patch
+	epatch "${FILESDIR}"/${P}-perl-as-needed.patch
+	epatch "${FILESDIR}"/${P}-perl-shortnames.patch
+	epatch "${FILESDIR}"/${P}-ac_config_header.patch
+	epatch "${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
+
+	cd dist || die
+	chmod +x findconfig || die
+
+	append-cppflags -I"$(db_includedir ${DBSLOTS})"
+
+	sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.in || die
+	rm -f configure || die
+	eautoreconf -Im4
+}
+
+src_configure() {
+	local myconf
+
+	use perl && myconf="${myconf} --enable-perlinterp"
+	use unicode && myconf="${myconf} --enable-widechar"
+	use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
+
+	append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'
+
+	pushd dist 2>/dev/null
+	econf \
+		--program-prefix=n \
+		${myconf} \
+		|| die "configure failed"
+	popd 2>/dev/null
+}
+
+src_compile() {
+	pushd dist 2>/dev/null
+	emake || die "make failed"
+	popd 2>/dev/null
+}
+
+src_install() {
+	pushd dist 2>/dev/null
+	emake -j1 DESTDIR="${D}" install || die "install failed"
+	popd 2>/dev/null
+}
+
+pkg_postinst() {
+	einfo "Setting /usr/bin/vi symlink"
+	eselect vi update --if-unset
+}
+
+pkg_postrm() {
+	einfo "Updating /usr/bin/vi symlink"
+	eselect vi update --if-unset
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 8a93150841be..684a96292e9f 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1 @@
-DIST docker-1.3.3.tar.gz 5886211 SHA256 9c054e438eee94e7028e860fcb2356a0983e98522223089902d0c61f505dbbcb SHA512 d0f928c1edfcd6d3e11893c2c41da430041fcbe53217e1abc978b379e5464c41204de97da9d5e3e06c1337f4e5b79e1ae98f734d62d64962b3f8b6c37c9bdb85 WHIRLPOOL 2fd4ae184d04f21c62a7e7157f81fe9484ce05cc019c184acc9bcc23db7ba2a866930c6bdcb69f2981a0c394e61e6c996a847bcd8102657a82806fdec2aed29d
-DIST docker-1.4.1.tar.gz 6054386 SHA256 34300e214e5d2f1633d9650be16bce86d635d72596faa575912fecefda612835 SHA512 e83bbc5443c42836768e71ba4a7f1aea0ba062439c85fef12bff3e812eb3c93b47bd455f36abbcf5a332c293f3274f7a00b3909ec4b919eff449aa52557997b3 WHIRLPOOL e85143c7182186819299ef517512ad9ac5101568bb5fcd016939a4ecb6803c2fd28c474502c07a257bb961bbb10316ec80306cdf038c13435855b58857cc70b1
 DIST docker-1.5.0.tar.gz 6459415 SHA256 cf97a1b3a75a63d3b7cb743b5376a1b1bc00eac651dce9e3f094202901a43c48 SHA512 cc620570c67454bedfae73de86b722a845fce4b0bd46446d1190ae98917010db54fbf82951167ebf62358e53dedb45fff2a7f25014c79b42efc2a5f2b611b4d9 WHIRLPOOL acb62b6c1b354212cf250b60227c5dbedc7fe6c6e729fc887653b776a991cd13650c643e20abf06a4326412cb10a1b4e2a20bac0a1fbc056b8d2cf2d54d1fcd0
diff --git a/app-emulation/docker/docker-1.3.3-r1.ebuild b/app-emulation/docker/docker-1.3.3-r1.ebuild
deleted file mode 100644
index ff4dbd74fb66..000000000000
--- a/app-emulation/docker/docker-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.3.3-r1.ebuild,v 1.2 2015/02/15 02:08:25 patrick Exp $
-
-EAPI=5
-
-DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
-HOMEPAGE="https://www.docker.com"
-
-GITHUB_URI="github.com/docker/docker"
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://${GITHUB_URI}.git"
-	inherit git-2
-else
-	SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	DOCKER_GITCOMMIT="d344625"
-	KEYWORDS="~amd64"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-fi
-
-inherit bash-completion-r1 linux-info multilib systemd udev user
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion"
-
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-"
-
-DEPEND="
-	${CDEPEND}
-	>=dev-lang/go-1.3
-	<dev-lang/go-1.4
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-
-	!app-emulation/docker-bin
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-
-	lxc? (
-		>=app-emulation/lxc-1.0
-	)
-	aufs? (
-		|| (
-			sys-fs/aufs3
-			sys-kernel/aufs-sources
-		)
-	)
-"
-
-RESTRICT="installsources strip"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED
-	~MACVLAN ~VETH ~BRIDGE
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-	~NF_NAT NF_NAT_NEEDED
-
-	~MEMCG_SWAP
-	~RESOURCE_COUNTERS
-	~CGROUP_PERF
-"
-
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-
-pkg_setup() {
-	if kernel_is lt 3 8; then
-		eerror ""
-		eerror "Using Docker with kernels older than 3.8 is unstable and unsupported."
-		eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
-		die 'Kernel is too old - need 3.8 or above'
-	fi
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-		"
-		# TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
-		# an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# allow user patches (use sparingly - upstream won't support them)
-	epatch_user
-}
-
-src_compile() {
-	# if we treat them right, Docker's build scripts will set up a
-	# reasonable GOPATH for us
-	export AUTO_GOPATH=1
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a zip, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	if gcc-specs-pie; then
-		sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-
-		sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
-	fi
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	# time to build!
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	# TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh
-}
-
-src_install() {
-	VERSION=$(cat VERSION)
-	newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
-	exeinto /usr/libexec/docker
-	newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	if use doc; then
-		# TODO doman contrib/man/man*/*
-
-		docompress -x /usr/share/doc/${PF}/md
-		docinto md
-		dodoc -r docs/sources/*
-	fi
-
-	dobashcomp contrib/completion/bash/*
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins contrib/completion/zsh/*
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r contrib/syntax/vim/ftdetect
-		doins -r contrib/syntax/vim/syntax
-	fi
-
-	if use contrib; then
-		mkdir -p "${D}/usr/share/${PN}/contrib"
-		cp -R contrib/* "${D}/usr/share/${PN}/contrib"
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog ""
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog ""
-
-	# create docker group if the code checking for it in /etc/group exists
-	enewgroup docker
-
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog ""
-}
diff --git a/app-emulation/docker/docker-1.4.1.ebuild b/app-emulation/docker/docker-1.4.1.ebuild
deleted file mode 100644
index f935ce8503c2..000000000000
--- a/app-emulation/docker/docker-1.4.1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.4.1.ebuild,v 1.2 2015/02/15 02:08:25 patrick Exp $
-
-EAPI=5
-
-DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
-HOMEPAGE="https://www.docker.com"
-
-GITHUB_URI="github.com/docker/docker"
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://${GITHUB_URI}.git"
-	inherit git-2
-else
-	SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	DOCKER_GITCOMMIT="5bc2ff8"
-	KEYWORDS="~amd64"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-fi
-
-inherit bash-completion-r1 linux-info multilib systemd udev user
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion"
-
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-"
-
-DEPEND="
-	${CDEPEND}
-	>=dev-lang/go-1.3
-	<dev-lang/go-1.4
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-
-	!app-emulation/docker-bin
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-
-	lxc? (
-		>=app-emulation/lxc-1.0
-	)
-	aufs? (
-		|| (
-			sys-fs/aufs3
-			sys-kernel/aufs-sources
-		)
-	)
-"
-
-RESTRICT="installsources strip"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED
-	~MACVLAN ~VETH ~BRIDGE
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-	~NF_NAT ~NF_NAT_NEEDED
-
-	~MEMCG_SWAP
-	~RESOURCE_COUNTERS
-	~CGROUP_PERF
-"
-
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-
-pkg_setup() {
-	if kernel_is lt 3 8; then
-		eerror ""
-		eerror "Using Docker with kernels older than 3.8 is unstable and unsupported."
-		eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
-		die 'Kernel is too old - need 3.8 or above'
-	fi
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-		"
-		# TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
-		# an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# allow user patches (use sparingly - upstream won't support them)
-	epatch_user
-}
-
-src_compile() {
-	# if we treat them right, Docker's build scripts will set up a
-	# reasonable GOPATH for us
-	export AUTO_GOPATH=1
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a zip, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	if gcc-specs-pie; then
-		sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-
-		sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
-	fi
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	# time to build!
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	# TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh
-}
-
-src_install() {
-	VERSION=$(cat VERSION)
-	newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
-	exeinto /usr/libexec/docker
-	newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	if use doc; then
-		# TODO doman contrib/man/man*/*
-
-		docompress -x /usr/share/doc/${PF}/md
-		docinto md
-		dodoc -r docs/sources/*
-	fi
-
-	dobashcomp contrib/completion/bash/*
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins contrib/completion/zsh/*
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r contrib/syntax/vim/ftdetect
-		doins -r contrib/syntax/vim/syntax
-	fi
-
-	if use contrib; then
-		mkdir -p "${D}/usr/share/${PN}/contrib"
-		cp -R contrib/* "${D}/usr/share/${PN}/contrib"
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog ""
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog ""
-
-	# create docker group if the code checking for it in /etc/group exists
-	enewgroup docker
-
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog ""
-}
diff --git a/app-forensics/lynis/lynis-1.6.4.ebuild b/app-forensics/lynis/lynis-1.6.4.ebuild
index 70064a813012..9d0bdd10663f 100644
--- a/app-forensics/lynis/lynis-1.6.4.ebuild
+++ b/app-forensics/lynis/lynis-1.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.6.4.ebuild,v 1.1 2014/11/16 13:23:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.6.4.ebuild,v 1.2 2015/02/19 09:04:18 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://cisofy.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 37171e23f0db..f027ce845d27 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1 @@
 DIST hivex-1.3.11.tar.gz 1264487 SHA256 c63adf6c7ef9140acf20775d35bef35ab563c0d2f59d3dfb8e0d15cfa7c77678 SHA512 1ff9fbcfb976fea5bba41c5ff06e4dc68af0e507accc236ca0406644ee2c865619b3b3bf9550124778fcd782ddc257f1d89861b45f48c0c3ceed18dfa1e02ced WHIRLPOOL 6d741ad14660390b2c171bff400645cbcd20a991a55b7fb4e349c864e2dd4e606f57f344d8b851acf87d12bf8a3b608a77c073c565d9aa55cd23094d7e09e8cd
-DIST hivex-1.3.2.tar.gz 1082330 SHA256 e02d664b262f616e842d58a3787315ceb239c5986ff0652b37af9aeed483025c SHA512 2ffa3585bd76f4c7daeb780e9bde8b22ec85caa5e8bbd8e1d7192c828e7914331e669f20b1aa6477cf72072699395b1c91877322f83e74067069f09e6a7c7ddc WHIRLPOOL 9373a88ed0a6fb0fb7d9011c8c2800ca9c4c9ff3f5121653d6150cfbb17243f6d94bee80a28a92b34be29f59df7e4f971d9acc3c03dd0049eb4524069a52471a
-DIST hivex-1.3.7.tar.gz 1168881 SHA256 9f74432bb7b620d6629265fa5efefa45a978b1ee80e4891d12789dc34896eb83 SHA512 0e3cbd02e457472a53ec06e0aab3d6fc65f67cf97d1f0bd5d62cadb52fd8f70f4281ee7e1fc614a5aa030d86edaab32c2eea3b9d9d9e2d77c12e4c421118a142 WHIRLPOOL 759307f458c1f2f082462aedc7f19cb5175f72a89efc32815d22f02b26353a73e5c5d0967ff2d002de919a17ae9999fec51b648355a8cdfefbc0557bc33bf9a6
diff --git a/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch b/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch
deleted file mode 100644
index 553f7a7ad87e..000000000000
--- a/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Hilko Bengen <bengen@debian.org>
-Date: Thu, 1 Dec 2011 22:07:26 +0100
-Subject: Fixed gnulib integration for hivexml
-
----
- lib/Makefile.am |    5 ++++-
- sh/Makefile.am  |    1 +
- xml/Makefile.am |    3 ++-
- xml/hivexml.c   |    2 ++
- 4 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index cfd2e05..a339a00 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -39,7 +39,10 @@ libhivex_la_LDFLAGS = \
- 	$(LTLIBINTL) \
- 	$(LTLIBTHREAD)
- libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
--libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir)
-+libhivex_la_CPPFLAGS = \
-+  -I$(top_srcdir)/gnulib/lib \
-+  -I$(top_builddir)/gnulib/lib \
-+  -I$(srcdir)
- 
- include_HEADERS = hivex.h
- 
-diff --git a/sh/Makefile.am b/sh/Makefile.am
-index 0898370..a6f5ae6 100644
---- a/sh/Makefile.am
-+++ b/sh/Makefile.am
-@@ -38,6 +38,7 @@ hivexsh_SOURCES = \
- hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE)
- hivexsh_CFLAGS = \
-   -I$(top_srcdir)/gnulib/lib \
-+  -I$(top_builddir)/gnulib/lib \
-   -I$(top_srcdir)/lib \
-   -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-   $(WARN_CFLAGS) $(WERROR_CFLAGS)
-diff --git a/xml/Makefile.am b/xml/Makefile.am
-index b2af45d..67ba248 100644
---- a/xml/Makefile.am
-+++ b/xml/Makefile.am
-@@ -23,10 +23,11 @@ bin_PROGRAMS = hivexml
- hivexml_SOURCES = \
-   hivexml.c
- 
--hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS)
-+hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS)
- hivexml_CFLAGS = \
-   -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-   -I$(top_srcdir)/gnulib/lib \
-+  -I$(top_builddir)/gnulib/lib \
-   -I$(top_srcdir)/lib \
-   $(LIBXML2_CFLAGS) \
-   $(WARN_CFLAGS) $(WERROR_CFLAGS)
-diff --git a/xml/hivexml.c b/xml/hivexml.c
-index 5030c24..d38e9d4 100644
---- a/xml/hivexml.c
-+++ b/xml/hivexml.c
-@@ -32,6 +32,8 @@
- #include <libintl.h>
- #endif
- 
-+#include <getopt.h>
-+
- #include <libxml/xmlwriter.h>
- 
- #include "hivex.h"
--- 
diff --git a/app-misc/hivex/files/1.3.3/0002-automake.patch b/app-misc/hivex/files/1.3.3/0002-automake.patch
deleted file mode 100644
index 8af8117c7f64..000000000000
--- a/app-misc/hivex/files/1.3.3/0002-automake.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Hilko Bengen <bengen@debian.org>
-Date: Thu, 1 Dec 2011 22:08:07 +0100
-Subject: automake
-
----
- lib/Makefile.in |    6 +++++-
- sh/Makefile.in  |    1 +
- xml/Makefile.in |    6 ++++--
- 3 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 65734dd..5cf7bde 100644
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -1045,7 +1045,11 @@ libhivex_la_LDFLAGS = \
- 	$(LTLIBTHREAD)
- 
- libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
--libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir)
-+libhivex_la_CPPFLAGS = \
-+  -I$(top_srcdir)/gnulib/lib \
-+  -I$(top_builddir)/gnulib/lib \
-+  -I$(srcdir)
-+
- include_HEADERS = hivex.h
- man_MANS = hivex.3
- noinst_DATA = \
-diff --git a/sh/Makefile.in b/sh/Makefile.in
-index 109c8e8..0308a32 100644
---- a/sh/Makefile.in
-+++ b/sh/Makefile.in
-@@ -995,6 +995,7 @@ hivexsh_SOURCES = \
- hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE)
- hivexsh_CFLAGS = \
-   -I$(top_srcdir)/gnulib/lib \
-+  -I$(top_builddir)/gnulib/lib \
-   -I$(top_srcdir)/lib \
-   -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-   $(WARN_CFLAGS) $(WERROR_CFLAGS)
-diff --git a/xml/Makefile.in b/xml/Makefile.in
-index ed4cd72..5cb647f 100644
---- a/xml/Makefile.in
-+++ b/xml/Makefile.in
-@@ -119,7 +119,8 @@ PROGRAMS = $(bin_PROGRAMS)
- am_hivexml_OBJECTS = hivexml-hivexml.$(OBJEXT)
- hivexml_OBJECTS = $(am_hivexml_OBJECTS)
- am__DEPENDENCIES_1 =
--hivexml_DEPENDENCIES = ../lib/libhivex.la $(am__DEPENDENCIES_1)
-+hivexml_DEPENDENCIES = ../lib/libhivex.la ../gnulib/lib/libgnu.la \
-+	$(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
- am__v_lt_0 = --silent
-@@ -976,10 +977,11 @@ EXTRA_DIST = \
- hivexml_SOURCES = \
-   hivexml.c
- 
--hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS)
-+hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS)
- hivexml_CFLAGS = \
-   -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-   -I$(top_srcdir)/gnulib/lib \
-+  -I$(top_builddir)/gnulib/lib \
-   -I$(top_srcdir)/lib \
-   $(LIBXML2_CFLAGS) \
-   $(WARN_CFLAGS) $(WERROR_CFLAGS)
--- 
diff --git a/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch b/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch
deleted file mode 100644
index e49d2d390e0c..000000000000
--- a/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -183,11 +183,19 @@
- AC_CHECK_FUNC([open_memstream])
- AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
- 
-+
- dnl Check for OCaml (optional, for OCaml bindings).
-+AC_ARG_ENABLE([ocaml],
-+       AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
-+
-+
-+
-+
- AC_PROG_OCAML
- AC_PROG_FINDLIB
- AM_CONDITIONAL([HAVE_OCAML],
--    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-+    [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"])
-+ 
- AM_CONDITIONAL([HAVE_OCAMLOPT],
-     [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
- 
-@@ -227,21 +235,32 @@
- dnl Check for Perl modules that must be present to compile and
- dnl test the Perl bindings.
- missing_perl_modules=no
--for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
--    AC_MSG_CHECKING([for $pm])
--    if ! perl -M$pm -e1 >/dev/null 2>&1; then
--        AC_MSG_RESULT([no])
--        missing_perl_modules=yes
--    else
--        AC_MSG_RESULT([yes])
--    fi
--done
--if test "x$missing_perl_modules" = "xyes"; then
--    AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
--fi
-+AC_ARG_ENABLE([perl],
-+       AS_HELP_STRING([--with-perl],[build Perl binding]))
-+
-+
-+PERL=
-+AS_IF([test "x$enable_perl" != "xno" ],[
-+       AC_CHECK_PROG([PERL],[perl],[yes],[no])
-+
-+    for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-+        AC_MSG_CHECKING([for $pm])
-+        if ! perl -M$pm -e1 >/dev/null 2>&1; then
-+            AC_MSG_RESULT([no])
-+            missing_perl_modules=yes
-+        else
-+            AC_MSG_RESULT([yes])
-+        fi
-+    done
-+
-+    AS_IF([test "x$missing_perl_modules" = "xyes"],
-+        [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
-+        )
-+])
- 
- AM_CONDITIONAL([HAVE_PERL],
--    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-+    [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
-+
- 
- dnl Check for Python (optional, for Python bindings).
- PYTHON_PREFIX=
-@@ -251,6 +270,7 @@
- 
- AC_CHECK_PROG([PYTHON],[python],[python],[no])
- 
-+
- if test "x$PYTHON" != "xno"; then
-     AC_MSG_CHECKING([Python prefix])
-     PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
-@@ -308,15 +328,24 @@
- AC_SUBST(PYTHON_INCLUDEDIR)
- AC_SUBST(PYTHON_INSTALLDIR)
- 
-+AC_ARG_ENABLE([python],
-+       AS_HELP_STRING([--with-python],[build Python binding]))
-+
- AM_CONDITIONAL([HAVE_PYTHON],
--    [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
-+ [test "x$PYTHON_INCLUDEDIR" != "x" -a  "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
-+
-+
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
-+AC_ARG_ENABLE([ruby],
-+       AS_HELP_STRING([--with-ruby],[build Ruby binding]))
-+
- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
- AC_CHECK_PROG([RAKE],[rake],[rake],[no])
- 
- AM_CONDITIONAL([HAVE_RUBY],
--    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-+    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"])
-+
- 
- dnl dnl Check for Java.
- dnl AC_ARG_WITH(java_home,
diff --git a/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch b/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch
deleted file mode 100644
index 5b77ede9d5c2..000000000000
--- a/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ruby/Rakefile.in.orig	2012-04-16 20:16:14.989449899 +0200
-+++ ruby/Rakefile.in	2012-04-16 20:17:08.006443779 +0200
-@@ -38,7 +38,7 @@
- # Build locally
- 
- file MAKEFILE => EXT_CONF do |t|
--     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
-+     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
-          $stderr.puts "Failed to run extconf"
-          break
-      end
diff --git a/app-misc/hivex/files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch
deleted file mode 100644
index d82db8a1aff3..000000000000
--- a/app-misc/hivex/files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -187,10 +187,12 @@
- AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
- 
- dnl Check for OCaml (optional, for OCaml bindings).
-+AC_ARG_ENABLE([ocaml],
-+       AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
- AC_PROG_OCAML
- AC_PROG_FINDLIB
- AM_CONDITIONAL([HAVE_OCAML],
--    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-+    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]])
- AM_CONDITIONAL([HAVE_OCAMLOPT],
-     [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
- 
diff --git a/app-misc/hivex/files/1.3.5/0002-add_per_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.5/0002-add_per_triplet_in_configure.ac.patch
deleted file mode 100644
index f3339d2bd9f4..000000000000
--- a/app-misc/hivex/files/1.3.5/0002-add_per_triplet_in_configure.ac.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,8 +245,31 @@
-     AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
- fi
- 
-+AC_ARG_ENABLE([perl],
-+       AS_HELP_STRING([--with-perl],[build Perl binding]))
-+
-+
-+PERL=
-+AS_IF([test "x$enable_perl" != "xno" ],[
-+       AC_CHECK_PROG([PERL],[perl],[yes],[no])
-+
-+    for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-+        AC_MSG_CHECKING([for $pm])
-+        if ! perl -M$pm -e1 >/dev/null 2>&1; then
-+            AC_MSG_RESULT([no])
-+            missing_perl_modules=yes
-+        else
-+            AC_MSG_RESULT([yes])
-+        fi
-+    done
-+
-+    AS_IF([test "x$missing_perl_modules" = "xyes"],
-+        [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
-+        )
-+])
-+
- AM_CONDITIONAL([HAVE_PERL],
--    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-+    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
- 
- dnl Check for Python (optional, for Python bindings).
- PYTHON_PREFIX=
diff --git a/app-misc/hivex/files/1.3.5/0003-fix_python_defenition_configure.ac.patch b/app-misc/hivex/files/1.3.5/0003-fix_python_defenition_configure.ac.patch
deleted file mode 100644
index d74b17c1e7c5..000000000000
--- a/app-misc/hivex/files/1.3.5/0003-fix_python_defenition_configure.ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -336,8 +336,11 @@
- AC_SUBST(PYTHON_INCLUDEDIR)
- AC_SUBST(PYTHON_INSTALLDIR)
- 
-+AC_ARG_ENABLE([python],
-+       AS_HELP_STRING([--with-python],[build Python binding]))
-+
- AM_CONDITIONAL([HAVE_PYTHON],
--    [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
-+ [test "x$PYTHON_INCLUDEDIR" != "x" -a  "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
- AC_ARG_ENABLE([ruby],
diff --git a/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch
deleted file mode 100644
index 25624c7104d1..000000000000
--- a/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ruby/Rakefile.in	2012-03-13 19:46:43.000000000 +0400
-+++ ruby/Rakefile.in	2012-04-15 19:02:42.337118192 +0400
-@@ -38,7 +38,7 @@
- # Build locally
- 
- file MAKEFILE => EXT_CONF do |t|
--     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
-+     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
-          $stderr.puts "Failed to run extconf"
-          break
-      end
diff --git a/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch b/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch
deleted file mode 100644
index 72ae84757b19..000000000000
--- a/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -187,14 +187,26 @@ AC_CHECK_FUNC([open_memstream])
- AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
- 
- dnl Check for OCaml (optional, for OCaml bindings).
--AC_PROG_OCAML
--AC_PROG_FINDLIB
-+OCAMLC=no
-+OCAMLFIND=no
-+AC_ARG_ENABLE([ocaml],
-+        AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]),
-+        [],
-+        [enable_ocaml=yes])
-+AS_IF([test "x$enable_ocaml" != "xno"],
-+        [dnl OCAMLC and OCAMLFIND have to be unset first, otherwise
-+         dnl AC_CHECK_TOOL (inside AC_PROG_OCAML) will not look.
-+         OCAMLC=
-+         OCAMLFIND=
-+         AC_PROG_OCAML
-+         AC_PROG_FINDLIB
-+        ])
- AM_CONDITIONAL([HAVE_OCAML],
--    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-+               [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
- AM_CONDITIONAL([HAVE_OCAMLOPT],
--    [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
-+               [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
- 
--if test "x$OCAMLC" != "xno"; then
-+if test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"; then
-     dnl Check if we have caml/unixsupport.h header (OCaml bindings only).
-     old_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS -I$OCAMLLIB"
-@@ -223,28 +235,32 @@ if test "x$OCAMLC" != "xno"; then
-     rm -f conftest conftest.* conftest_ml.*
- fi
- 
--dnl Check for Perl (optional, for Perl bindings).
--dnl XXX This isn't quite right, we should check for Perl devel library.
-+dnl Check for Perl (optional, for Perl bindings and Perl tools).
- AC_CHECK_PROG([PERL],[perl],[perl],[no])
- 
--dnl Check for Perl modules that must be present to compile and
--dnl test the Perl bindings.
--missing_perl_modules=no
--for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
--    AC_MSG_CHECKING([for $pm])
--    if ! perl -M$pm -e1 >/dev/null 2>&1; then
--        AC_MSG_RESULT([no])
--        missing_perl_modules=yes
--    else
--        AC_MSG_RESULT([yes])
--    fi
--done
--if test "x$missing_perl_modules" = "xyes"; then
--    AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
--fi
--
-+AC_ARG_ENABLE([perl],
-+        AS_HELP_STRING([--disable-perl], [Disable Perl language bindings]),
-+        [],
-+        [enable_perl=yes])
-+AS_IF([test "x$enable_perl" != "xno"],[
-+        dnl Check for Perl modules that must be present to compile and
-+        dnl test the Perl bindings.
-+        missing_perl_modules=no
-+        for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-+            AC_MSG_CHECKING([for $pm])
-+            if ! $PERL -M$pm -e1 >/dev/null 2>&1; then
-+                AC_MSG_RESULT([no])
-+                missing_perl_modules=yes
-+            else
-+                AC_MSG_RESULT([yes])
-+            fi
-+        done
-+        if test "x$missing_perl_modules" = "xyes"; then
-+            AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
-+        fi
-+        ])
- AM_CONDITIONAL([HAVE_PERL],
--    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-+    [test "x$enable_perl" != "xno" && test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
- 
- dnl Check for Python (optional, for Python bindings).
- PYTHON_PREFIX=
-@@ -252,85 +268,111 @@ PYTHON_VERSION=
- PYTHON_INCLUDEDIR=
- PYTHON_INSTALLDIR=
- 
--AC_CHECK_PROG([PYTHON],[python],[python],[no])
--
--if test "x$PYTHON" != "xno"; then
--    AC_MSG_CHECKING([Python prefix])
--    PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
--    AC_MSG_RESULT([$PYTHON_PREFIX])
--
--    AC_MSG_CHECKING([Python version])
--    PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
--    PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
--    PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
--    AC_MSG_RESULT([$PYTHON_VERSION])
--
--    AC_MSG_CHECKING([for Python include path])
--    if test -z "$PYTHON_INCLUDEDIR"; then
--        python_path=`$PYTHON -c "import distutils.sysconfig; \
--                                 print (distutils.sysconfig.get_python_inc ());"`
--        PYTHON_INCLUDEDIR=$python_path
--    fi
--    AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
--
--    AC_ARG_WITH([python-installdir],
--                [AS_HELP_STRING([--with-python-installdir],
--		                [directory to install python modules @<:@default=check@:>@])],
--		[PYTHON_INSTALLDIR="$withval"
--		AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])],
--		[PYTHON_INSTALLDIR=check])
--
--    if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
--        PYTHON_INSTALLDIR=
--        AC_MSG_CHECKING([for Python site-packages path])
--        if test -z "$PYTHON_INSTALLDIR"; then
--            PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \
--                                           print (distutils.sysconfig.get_python_lib(1,0));"`
-+AC_ARG_ENABLE([python],
-+        AS_HELP_STRING([--disable-python], [Disable Python language bindings]),
-+        [],
-+        [enable_python=yes])
-+AS_IF([test "x$enable_python" != "xno"],
-+        [
-+        AC_CHECK_PROG([PYTHON],[python],[python],[no])
-+
-+        if test "x$PYTHON" != "xno"; then
-+	    AC_MSG_CHECKING([Python prefix])
-+            PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
-+	    AC_MSG_RESULT([$PYTHON_PREFIX])
-+
-+	    AC_MSG_CHECKING([Python version])
-+            PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
-+            PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
-+            PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
-+	    AC_MSG_RESULT([$PYTHON_VERSION])
-+
-+            AC_MSG_CHECKING([for Python include path])
-+            if test -z "$PYTHON_INCLUDEDIR"; then
-+                python_path=`$PYTHON -c "import distutils.sysconfig; \
-+                                         print (distutils.sysconfig.get_python_inc ());"`
-+                PYTHON_INCLUDEDIR=$python_path
-+            fi
-+            AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
-+
-+            AC_ARG_WITH([python-installdir],
-+                        [AS_HELP_STRING([--with-python-installdir],
-+			                [directory to install python modules @<:@default=check@:>@])],
-+			[PYTHON_INSTALLDIR="$withval"
-+			AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])],
-+			[PYTHON_INSTALLDIR=check])
-+
-+	    if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
-+	        PYTHON_INSTALLDIR=
-+                AC_MSG_CHECKING([for Python site-packages path])
-+                if test -z "$PYTHON_INSTALLDIR"; then
-+                    PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \
-+                                                   print (distutils.sysconfig.get_python_lib(1,0));"`
-+                fi
-+                AC_MSG_RESULT([$PYTHON_INSTALLDIR])
-+            fi
-+
-+            dnl Look for some optional symbols in libpython.
-+            old_LIBS="$LIBS"
-+
-+            PYTHON_BLDLIBRARY=`$PYTHON -c "import distutils.sysconfig; \
-+                                           print (distutils.sysconfig.get_config_var('BLDLIBRARY'))"`
-+            AC_CHECK_LIB([c],[PyCapsule_New],
-+                         [AC_DEFINE([HAVE_PYCAPSULE_NEW],1,
-+                                    [Found PyCapsule_New in libpython])],
-+                         [],[$PYTHON_BLDLIBRARY])
-+            AC_CHECK_LIB([c],[PyString_AsString],
-+                         [AC_DEFINE([HAVE_PYSTRING_ASSTRING],1,
-+                                    [Found PyString_AsString in libpython])],
-+                         [],[$PYTHON_BLDLIBRARY])
-+
-+            LIBS="$old_LIBS"
-         fi
--        AC_MSG_RESULT([$PYTHON_INSTALLDIR])
--    fi
--
--    dnl Look for libpython and some optional symbols in it.
--    old_LIBS="$LIBS"
--    if test "x$PYTHON_VERSION_MAJOR" = "x3"; then
--        dnl libpython3 is called "libpython3.Xmu.so"
--        LIBPYTHON="python${PYTHON_VERSION}mu"
--    else
--        LIBPYTHON="python$PYTHON_VERSION"
--    fi
--    AC_CHECK_LIB([$LIBPYTHON], [PyList_Size], [],
--                 [AC_MSG_FAILURE([$LIBPYTHON is not installed])])
--
--    AC_CHECK_FUNCS([PyCapsule_New \
--                    PyString_AsString])
--    LIBS="$old_LIBS"
--fi
--
--AC_SUBST(PYTHON_PREFIX)
--AC_SUBST(PYTHON_VERSION)
--AC_SUBST(PYTHON_INCLUDEDIR)
--AC_SUBST(PYTHON_INSTALLDIR)
- 
-+        AC_SUBST(PYTHON_PREFIX)
-+        AC_SUBST(PYTHON_VERSION)
-+        AC_SUBST(PYTHON_INCLUDEDIR)
-+        AC_SUBST(PYTHON_INSTALLDIR)
-+        ])
- AM_CONDITIONAL([HAVE_PYTHON],
-     [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
- AC_ARG_ENABLE([ruby],
--        AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]),
--        [],
--        [enable_ruby=yes])
--AS_IF([test "x$enable_ruby" != "xno"],
--        [
--        AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
--        AC_CHECK_PROG([RAKE],[rake],[rake],[no])
--        AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
--        AC_SUBST(RAKE)
-+    AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]),
-+    [],
-+    [enable_ruby=yes])
-+AS_IF([test "x$enable_ruby" != "xno"],[
-+    AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
-+    AC_CHECK_PROG([RAKE],[rake],[rake],[no])
-+
-+    AS_IF([test -n "$RUBY" && test -n "$RAKE"],[
-+        dnl Find the library.  Note on Debian it's not -lruby.
-+        AC_MSG_CHECKING([for C library for Ruby extensions])
-+        ruby_cmd='puts RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@'
-+        echo running: $RUBY -rrbconfig -e \'$ruby_cmd\' >&AS_MESSAGE_LOG_FD
-+        $RUBY -rrbconfig -e "$ruby_cmd" >conftest 2>&AS_MESSAGE_LOG_FD
-+        libruby="$(cat conftest)"
-+        rm conftest
-+        AS_IF([test -n "$libruby"],[
-+            AC_MSG_RESULT([-l$libruby])
-+            AC_CHECK_LIB([$libruby],[ruby_init],
-+                         [have_libruby=1],[have_libruby=])
-+
-+            dnl Symbols that we substitute when missing.
-+            AS_IF([test -n "$have_libruby"],[
-+                old_LIBS="$LIBS"
-+                LIBS="$LIBS -l$libruby"
-+                AC_CHECK_FUNCS([rb_hash_lookup])
-+                LIBS="$old_LIBS"
-+            ])
-+        ],[
-+            AC_MSG_RESULT([not found])
-         ])
-+    ])
-+])
- AM_CONDITIONAL([HAVE_RUBY],
--    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
--
--AM_CONDITIONAL([HAVE_RUBY],
--    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-+    [test -n "$RUBY" && test -n "$RAKE" && test -n "$have_libruby"])
- 
- dnl dnl Check for Java.
- dnl AC_ARG_WITH(java_home,
diff --git a/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch b/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch
deleted file mode 100644
index 283d68897de5..000000000000
--- a/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python/Makefile.am	2012-06-12 14:12:50.000000000 +0400
-+++ python/Makefile.am	2012-09-17 16:21:55.230278577 +0400
-@@ -35,7 +35,7 @@
- libhivexmod_la_SOURCES = hivex-py.c
- libhivexmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \
- 		        -I$(top_srcdir)/lib -I$(top_builddir)/lib
--libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la
-+libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la -lpython$(PYTHON_VERSION)
- libhivexmod_la_LDFLAGS = -avoid-version -shared
- 
- TESTS_ENVIRONMENT = \
diff --git a/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch
deleted file mode 100644
index d82db8a1aff3..000000000000
--- a/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -187,10 +187,12 @@
- AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
- 
- dnl Check for OCaml (optional, for OCaml bindings).
-+AC_ARG_ENABLE([ocaml],
-+       AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
- AC_PROG_OCAML
- AC_PROG_FINDLIB
- AM_CONDITIONAL([HAVE_OCAML],
--    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-+    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]])
- AM_CONDITIONAL([HAVE_OCAMLOPT],
-     [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
- 
diff --git a/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch
deleted file mode 100644
index f3339d2bd9f4..000000000000
--- a/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,8 +245,31 @@
-     AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
- fi
- 
-+AC_ARG_ENABLE([perl],
-+       AS_HELP_STRING([--with-perl],[build Perl binding]))
-+
-+
-+PERL=
-+AS_IF([test "x$enable_perl" != "xno" ],[
-+       AC_CHECK_PROG([PERL],[perl],[yes],[no])
-+
-+    for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-+        AC_MSG_CHECKING([for $pm])
-+        if ! perl -M$pm -e1 >/dev/null 2>&1; then
-+            AC_MSG_RESULT([no])
-+            missing_perl_modules=yes
-+        else
-+            AC_MSG_RESULT([yes])
-+        fi
-+    done
-+
-+    AS_IF([test "x$missing_perl_modules" = "xyes"],
-+        [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
-+        )
-+])
-+
- AM_CONDITIONAL([HAVE_PERL],
--    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-+    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
- 
- dnl Check for Python (optional, for Python bindings).
- PYTHON_PREFIX=
diff --git a/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch b/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch
deleted file mode 100644
index d74b17c1e7c5..000000000000
--- a/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -336,8 +336,11 @@
- AC_SUBST(PYTHON_INCLUDEDIR)
- AC_SUBST(PYTHON_INSTALLDIR)
- 
-+AC_ARG_ENABLE([python],
-+       AS_HELP_STRING([--with-python],[build Python binding]))
-+
- AM_CONDITIONAL([HAVE_PYTHON],
--    [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
-+ [test "x$PYTHON_INCLUDEDIR" != "x" -a  "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
- AC_ARG_ENABLE([ruby],
diff --git a/app-misc/hivex/files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch
deleted file mode 100644
index 25624c7104d1..000000000000
--- a/app-misc/hivex/files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ruby/Rakefile.in	2012-03-13 19:46:43.000000000 +0400
-+++ ruby/Rakefile.in	2012-04-15 19:02:42.337118192 +0400
-@@ -38,7 +38,7 @@
- # Build locally
- 
- file MAKEFILE => EXT_CONF do |t|
--     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
-+     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
-          $stderr.puts "Failed to run extconf"
-          break
-      end
diff --git a/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch
deleted file mode 100644
index 25624c7104d1..000000000000
--- a/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ruby/Rakefile.in	2012-03-13 19:46:43.000000000 +0400
-+++ ruby/Rakefile.in	2012-04-15 19:02:42.337118192 +0400
-@@ -38,7 +38,7 @@
- # Build locally
- 
- file MAKEFILE => EXT_CONF do |t|
--     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
-+     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
-          $stderr.puts "Failed to run extconf"
-          break
-      end
diff --git a/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch b/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch
deleted file mode 100644
index defd14a4f700..000000000000
--- a/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/ruby/Makefile.am b/ruby/Makefile.am
---- a/ruby/Makefile.am
-+++ b/ruby/Makefile.am
-@@ -44,11 +44,11 @@
- 	RUBY=$(RUBY) RAKE=$(RAKE)
- 
- all:
--	$(RAKE) build
--	$(RAKE) rdoc
-+	$(RAKE) -v build
-+	$(RAKE) -v rdoc
- 
--RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
--RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-+RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
-+RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
- 
- install:
- 	$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
-diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
---- a/ruby/Rakefile.in
-+++ b/ruby/Rakefile.in
-@@ -17,9 +17,9 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- require 'rake/clean'
--require 'rake/rdoctask'
-+require 'rdoc/task'
- require 'rake/testtask'
--require 'rake/gempackagetask'
-+require 'rubygems/package_task'
- 
- PKG_NAME='@PACKAGE_NAME@'
- PKG_VERSION='@PACKAGE_VERSION@'
-@@ -108,7 +108,7 @@
- EOF
- end
- 
--Rake::GemPackageTask.new(SPEC) do |pkg|
-+Gem::PackageTask.new(SPEC) do |pkg|
-     pkg.need_tar = true
-     pkg.need_zip = true
- end
diff --git a/app-misc/hivex/files/autoconf_fix-1.3.2.patch b/app-misc/hivex/files/autoconf_fix-1.3.2.patch
deleted file mode 100644
index 2a9495b51cea..000000000000
--- a/app-misc/hivex/files/autoconf_fix-1.3.2.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- configure.ac.orig	2011-08-15 22:29:28.309745342 +0300
-+++ configure.ac	2011-08-15 22:34:54.324549151 +0300
-@@ -170,11 +170,18 @@
- AC_SUBST([LIBXML2_CFLAGS])
- AC_SUBST([LIBXML2_LIBS])
- 
-+
-+dnl ////////////////////////////////////////////////////////////////////////////
- dnl Check for OCaml (optional, for OCaml bindings).
-+
-+AC_ARG_ENABLE([ocaml],
-+       AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
-+
-+
- AC_PROG_OCAML
- AC_PROG_FINDLIB
- AM_CONDITIONAL([HAVE_OCAML],
--    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-+    [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"])
- AM_CONDITIONAL([HAVE_OCAMLOPT],
-     [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
- 
-@@ -207,6 +214,8 @@
-     rm -f conftest conftest.* conftest_ml.*
- fi
- 
-+dnl ///////////////////////////////////////////////////////////////////////////////////////
-+
- dnl Check for Perl (optional, for Perl bindings).
- dnl XXX This isn't quite right, we should check for Perl devel library.
- AC_CHECK_PROG([PERL],[perl],[perl],[no])
-@@ -214,21 +223,35 @@
- dnl Check for Perl modules that must be present to compile and
- dnl test the Perl bindings.
- missing_perl_modules=no
--for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
--    AC_MSG_CHECKING([for $pm])
--    if ! perl -M$pm -e1 >/dev/null 2>&1; then
--        AC_MSG_RESULT([no])
--        missing_perl_modules=yes
--    else
--        AC_MSG_RESULT([yes])
--    fi
--done
--if test "x$missing_perl_modules" = "xyes"; then
--    AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
--fi
-+
-+AC_ARG_ENABLE([perl],
-+       AS_HELP_STRING([--with-perl],[build Perl binding]))
-+
-+
-+PERL=
-+AS_IF([test "x$enable_perl" != "xno" ],[
-+       AC_CHECK_PROG([PERL],[perl],[yes],[no])
-+
-+    for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-+        AC_MSG_CHECKING([for $pm])
-+        if ! perl -M$pm -e1 >/dev/null 2>&1; then
-+            AC_MSG_RESULT([no])
-+            missing_perl_modules=yes
-+        else
-+            AC_MSG_RESULT([yes])
-+        fi
-+    done
-+
-+    AS_IF([test "x$missing_perl_modules" = "xyes"],
-+        [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
-+        )
-+])
-+
- 
- AM_CONDITIONAL([HAVE_PERL],
--    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-+    [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
-+
-+dnl //////////////////////////////////////////////////////////////////////////////////////////////////
- 
- dnl Check for Python (optional, for Python bindings).
- AC_CHECK_PROG([PYTHON],[python],[python],[no])
-@@ -266,15 +289,21 @@
- AC_SUBST(PYTHON_INCLUDEDIR)
- AC_SUBST(PYTHON_SITE_PACKAGES)
- 
-+AC_ARG_ENABLE([python],
-+       AS_HELP_STRING([--with-python],[build Python binding]))
-+
- AM_CONDITIONAL([HAVE_PYTHON],
--    [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"])
-+    [test "x$PYTHON_INCLUDEDIR" != "x" -a  "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
- AC_CHECK_PROG([RAKE],[rake],[rake],[no])
- 
-+AC_ARG_ENABLE([ruby],
-+       AS_HELP_STRING([--with-ruby],[build Ruby binding]))
-+
- AM_CONDITIONAL([HAVE_RUBY],
--    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-+    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"])
- 
- dnl dnl Check for Java.
- dnl AC_ARG_WITH(java_home,
diff --git a/app-misc/hivex/files/python-test-fix-1.3.2.patch b/app-misc/hivex/files/python-test-fix-1.3.2.patch
deleted file mode 100644
index 0b31e216e048..000000000000
--- a/app-misc/hivex/files/python-test-fix-1.3.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python/run-python-tests.in	2011-08-11 22:40:25.000000000 +0400
-+++ python/run-python-tests.in	2011-11-06 11:52:14.064248069 +0400
-@@ -19,7 +19,7 @@
- set -e
- shopt -s nullglob
- 
--for f in $(srcdir)t/*.py; do
-+for f in ${srcdir}t/*.py; do
-   basename "$f"
-   @PYTHON@ "$f"
- done
diff --git a/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch b/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch
deleted file mode 100644
index 5b77ede9d5c2..000000000000
--- a/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ruby/Rakefile.in.orig	2012-04-16 20:16:14.989449899 +0200
-+++ ruby/Rakefile.in	2012-04-16 20:17:08.006443779 +0200
-@@ -38,7 +38,7 @@
- # Build locally
- 
- file MAKEFILE => EXT_CONF do |t|
--     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
-+     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
-          $stderr.puts "Failed to run extconf"
-          break
-      end
diff --git a/app-misc/hivex/hivex-1.3.11.ebuild b/app-misc/hivex/hivex-1.3.11.ebuild
index 01b4e84b769c..b31464d77c5b 100644
--- a/app-misc/hivex/hivex-1.3.11.ebuild
+++ b/app-misc/hivex/hivex-1.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.11.ebuild,v 1.4 2015/01/09 08:34:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.11.ebuild,v 1.5 2015/02/19 07:34:27 pinkbyte Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ RUBY_OPTIONAL=yes
 
 PYTHON_COMPAT=(python2_7 python3_{3,4})
 
-inherit base autotools  autotools-utils eutils perl-app ruby-ng python-single-r1
+inherit autotools-utils eutils perl-app ruby-ng python-single-r1
 
 DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
 HOMEPAGE="http://libguestfs.org"
@@ -67,7 +67,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	base_src_prepare
+	epatch_user
 }
 
 src_configure() {
diff --git a/app-misc/hivex/hivex-1.3.2-r2.ebuild b/app-misc/hivex/hivex-1.3.2-r2.ebuild
deleted file mode 100644
index 2b3dcd8ad42e..000000000000
--- a/app-misc/hivex/hivex-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2-r2.ebuild,v 1.4 2014/11/16 20:25:35 dilfridge Exp $
-
-EAPI=5
-
-WANT_AUTOMAKE="1.11"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-
-PYTHON_DEPEND="python? 2:2.6"
-inherit base autotools-utils perl-app python
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="http://libguestfs.org"
-SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="ocaml readline perl python test static-libs ruby"
-
-RDEPEND="virtual/libiconv
-	virtual/libintl
-	dev-libs/libxml2:2
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	readline? ( sys-libs/readline )
-	perl? ( dev-perl/IO-stringy )
-	"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	perl? (
-	 	test? ( dev-perl/Pod-Coverage
-				dev-perl/Test-Pod-Coverage ) )
-	ruby? ( dev-ruby/rake )
-	"
-PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch
-"${FILESDIR}"/python-test-fix-${PV}.patch
-"${FILESDIR}"/ruby_runpath_fix-${PV}.patch)
-DOCS=(README)
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-		python_need_rebuild
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/gets is a security/d' gnulib/lib/stdio.in.h || die "sed failed"
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		$(use_enable python)
-		$(use_enable ruby)
-		--disable-rpath )
-
-		autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_compile check
-}
-
-src_install() {
-	strip-linguas -i po
-
-	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
-
-	if use perl; then
-		perl_delete_localpod
-	fi
-}
diff --git a/app-misc/hivex/hivex-1.3.7-r1.ebuild b/app-misc/hivex/hivex-1.3.7-r1.ebuild
deleted file mode 100644
index 09cac6c66898..000000000000
--- a/app-misc/hivex/hivex-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.7-r1.ebuild,v 1.4 2015/01/05 19:44:24 graaff Exp $
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-WANT_AUTOMAKE=1.11
-
-USE_RUBY="ruby19"
-RUBY_OPTIONAL=yes
-PYTHON_DEPEND="python? 2:2.6"
-SUPPORT_PYTHON_ABIS=1
-
-inherit base autotools autotools-utils eutils perl-app ruby-ng python
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="http://libguestfs.org"
-SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ocaml readline +perl python test static-libs ruby"
-
-RDEPEND="
-	virtual/libiconv
-	virtual/libintl
-	dev-libs/libxml2:2
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	readline? ( sys-libs/readline )
-	perl? ( dev-perl/IO-stringy )
-	ruby? ( $(ruby_implementations_depend) )
-	"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	perl? (
-		test? ( dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage )
-		  )
-	"
-
-ruby_add_bdepend "ruby? ( dev-ruby/rake )"
-ruby_add_bdepend "ruby? ( dev-ruby/rdoc )"
-
-DOCS=(README)
-PATCHES=("${FILESDIR}"/"${PV}"/*.patch)
-
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-	if use perl; then
-		perl_set_version
-	fi
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	base_src_prepare
-	eautomake
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		$(use_enable python)
-		$(use_enable ruby)
-		--disable-rpath )
-
-	autotools-utils_src_configure
-
-	if use perl; then
-		pushd perl
-		perl-app_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-}
-
-src_test() {
-	if use perl;then
-		pushd perl
-		perl-app_src_install
-		popd
-	fi
-
-	autotools-utils_src_compile check
-}
-
-src_install() {
-	strip-linguas -i po
-
-	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
-
-	if use perl; then
-		perl_delete_localpod
-	fi
-	if use python; then
-		compile_and_install() {
-			emake -C python clean
-			emake -C python PYTHON_VERSION="${PYTHON_ABI}" \
-							PYTHON_INCLUDEDIR="$(python_get_includedir)" \
-							PYTHON_INSTALLDIR="$(python_get_sitedir)" \
-							DESTDIR="${ED}" install
-		}
-		python_execute_function compile_and_install
-	fi
-}
diff --git a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
index 7fffb2492eb1..e1a68a40d6b4 100644
--- a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
+++ b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild,v 1.2 2015/02/18 11:20:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild,v 1.3 2015/02/19 10:40:47 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://xyne.archlinux.ca/projects/${PN}/src/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.31.ebuild b/app-officeext/ooofbtools/ooofbtools-2.31.ebuild
index 650b6313d86a..3c9ded970c97 100644
--- a/app-officeext/ooofbtools/ooofbtools-2.31.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooofbtools/ooofbtools-2.31.ebuild,v 1.1 2015/01/14 13:40:57 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooofbtools/ooofbtools-2.31.ebuild,v 1.2 2015/02/19 10:40:37 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND="dev-libs/libxml2"
diff --git a/app-text/pandoc/pandoc-1.12.1.ebuild b/app-text/pandoc/pandoc-1.12.1.ebuild
index 89b6efd4a4f7..130e7005c53d 100644
--- a/app-text/pandoc/pandoc-1.12.1.ebuild
+++ b/app-text/pandoc/pandoc-1.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.1.ebuild,v 1.2 2015/02/16 14:41:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.1.ebuild,v 1.3 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -45,6 +45,7 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
 	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
diff --git a/app-text/pandoc/pandoc-1.12.2.1.ebuild b/app-text/pandoc/pandoc-1.12.2.1.ebuild
index 26a7330450ff..6823edda3262 100644
--- a/app-text/pandoc/pandoc-1.12.2.1.ebuild
+++ b/app-text/pandoc/pandoc-1.12.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.2.1.ebuild,v 1.1 2013/12/11 11:36:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.2.1.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -45,6 +45,7 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
 	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
diff --git a/app-text/pandoc/pandoc-1.12.3.1.ebuild b/app-text/pandoc/pandoc-1.12.3.1.ebuild
index e8a57a00612b..4378f060ed4d 100644
--- a/app-text/pandoc/pandoc-1.12.3.1.ebuild
+++ b/app-text/pandoc/pandoc-1.12.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.3.1.ebuild,v 1.1 2014/02/01 19:57:11 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.3.1.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -46,6 +46,7 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
 	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
diff --git a/app-text/pandoc/pandoc-1.12.3.3.ebuild b/app-text/pandoc/pandoc-1.12.3.3.ebuild
index d101b5a21c3c..8c6916ddf582 100644
--- a/app-text/pandoc/pandoc-1.12.3.3.ebuild
+++ b/app-text/pandoc/pandoc-1.12.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.3.3.ebuild,v 1.2 2014/04/13 13:04:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.3.3.ebuild,v 1.3 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -46,6 +46,7 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
 	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
diff --git a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
index ab684cb98293..55392d7330a5 100644
--- a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild,v 1.1 2014/07/02 14:59:14 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -49,6 +49,7 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
 	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
diff --git a/app-text/pandoc/pandoc-1.12.4.ebuild b/app-text/pandoc/pandoc-1.12.4.ebuild
index f754e8561729..c6c4c6b37471 100644
--- a/app-text/pandoc/pandoc-1.12.4.ebuild
+++ b/app-text/pandoc/pandoc-1.12.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.4.ebuild,v 1.1 2014/05/10 12:12:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.4.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -49,6 +49,7 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
 	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
diff --git a/app-text/pandoc/pandoc-1.12.ebuild b/app-text/pandoc/pandoc-1.12.ebuild
index df1fcd5c3ba4..e109b98afcf9 100644
--- a/app-text/pandoc/pandoc-1.12.ebuild
+++ b/app-text/pandoc/pandoc-1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.ebuild,v 1.4 2013/11/24 19:32:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.ebuild,v 1.5 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -46,6 +46,7 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
 	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
diff --git a/app-text/pandoc/pandoc-1.13.1-r3.ebuild b/app-text/pandoc/pandoc-1.13.1-r3.ebuild
index 764421be0958..ccb7f31d4b73 100644
--- a/app-text/pandoc/pandoc-1.13.1-r3.ebuild
+++ b/app-text/pandoc/pandoc-1.13.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.1-r3.ebuild,v 1.1 2014/12/13 22:40:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.1-r3.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -49,6 +49,7 @@ RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profil
 	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
 			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
diff --git a/app-text/pandoc/pandoc-1.13.2-r1.ebuild b/app-text/pandoc/pandoc-1.13.2-r1.ebuild
index b28efbcce7aa..86fbc6cf3b11 100644
--- a/app-text/pandoc/pandoc-1.13.2-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.13.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v 1.1 2015/01/05 05:04:03 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -49,6 +49,7 @@ RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profil
 	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
 			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
diff --git a/app-text/pandoc/pandoc-1.13.2.ebuild b/app-text/pandoc/pandoc-1.13.2.ebuild
index dae59807ada4..a2dda415e95f 100644
--- a/app-text/pandoc/pandoc-1.13.2.ebuild
+++ b/app-text/pandoc/pandoc-1.13.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2.ebuild,v 1.1 2014/12/20 09:52:26 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
 
 EAPI=5
 
@@ -49,6 +49,7 @@ RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profil
 	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
 	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
 			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
index 5f087a0de0a5..ddc8292b4f61 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild,v 1.1 2014/10/19 09:57:03 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild,v 1.2 2015/02/19 09:08:09 ago Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-games/paklib/paklib-0.3.ebuild b/dev-games/paklib/paklib-0.3.ebuild
index 0c6d518a94f3..3ce15aee02d4 100644
--- a/dev-games/paklib/paklib-0.3.ebuild
+++ b/dev-games/paklib/paklib-0.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/paklib/paklib-0.3.ebuild,v 1.3 2010/09/17 09:04:34 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/paklib/paklib-0.3.ebuild,v 1.4 2015/02/19 09:42:13 mr_bones_ Exp $
 
+EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="library for accessing Quake pak files"
@@ -13,8 +14,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
-
 S=${WORKDIR}/pak
 
 src_compile() {
@@ -23,9 +22,9 @@ src_compile() {
 }
 
 src_install() {
-	dolib.so libpak.so || die "pak.so failed"
-	dolib.a libpak.a || die "pak.a failed"
+	dolib.so libpak.so
+	dolib.a libpak.a
 	insinto /usr/include
-	doins pak.h || die "pak.h failed"
+	doins pak.h
 	dodoc AUTHORS NEWS README TODO pak.c pak.h
 }
diff --git a/dev-haskell/failure/failure-0.2.0.3.ebuild b/dev-haskell/failure/failure-0.2.0.3.ebuild
index a7b63d2fcbe7..2b323f74303c 100644
--- a/dev-haskell/failure/failure-0.2.0.3.ebuild
+++ b/dev-haskell/failure/failure-0.2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/failure/failure-0.2.0.3.ebuild,v 1.1 2014/07/03 05:41:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/failure/failure-0.2.0.3.ebuild,v 1.2 2015/02/19 09:04:53 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
diff --git a/dev-haskell/fgl/fgl-5.5.0.1.ebuild b/dev-haskell/fgl/fgl-5.5.0.1.ebuild
index 6bcff28ac6c0..eb66ab159586 100644
--- a/dev-haskell/fgl/fgl-5.5.0.1.ebuild
+++ b/dev-haskell/fgl/fgl-5.5.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/fgl-5.5.0.1.ebuild,v 1.1 2014/07/02 08:03:56 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/fgl-5.5.0.1.ebuild,v 1.2 2015/02/19 09:07:38 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/file-embed/file-embed-0.0.7.ebuild b/dev-haskell/file-embed/file-embed-0.0.7.ebuild
index 38232d092da6..96e6840bce64 100644
--- a/dev-haskell/file-embed/file-embed-0.0.7.ebuild
+++ b/dev-haskell/file-embed/file-embed-0.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/file-embed/file-embed-0.0.7.ebuild,v 1.2 2014/07/25 09:16:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/file-embed/file-embed-0.0.7.ebuild,v 1.3 2015/02/19 09:07:13 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
index 85a38aeb0b1e..9b7fbf5244b0 100644
--- a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
+++ b/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild,v 1.1 2014/03/09 05:12:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild,v 1.2 2015/02/19 09:05:23 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/hsb2hs/Manifest b/dev-haskell/hsb2hs/Manifest
new file mode 100644
index 000000000000..14e77671bdb7
--- /dev/null
+++ b/dev-haskell/hsb2hs/Manifest
@@ -0,0 +1 @@
+DIST hsb2hs-0.2.tar.gz 2341 SHA256 dd85a79fd1579257bc5b4c0e7d769f964cd92a7a2db2ea56ed3c1102101d7604 SHA512 d5150ee9914a4916b5162b704a29c23e2c8562c773226b2b2f017304cdd4ce55872f8c7e9be7a5385acc31711f622e74c508bdc40ba1d22981b0e8aec5e4e516 WHIRLPOOL d28a6389e36bb0a5ee4ce486e9c534d6f9f8e1b562503670538f74ec7da24bc7a75038635c9bd06de1c8c1f39875851470a91201cfde612457164994f792d70c
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
new file mode 100644
index 000000000000..d2227725d431
--- /dev/null
+++ b/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild,v 1.2 2015/02/18 21:15:38 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="Preprocesses a file, adding blobs from files as string literals"
+HOMEPAGE="http://hackage.haskell.org/package/hsb2hs"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+	>dev-haskell/preprocessor-tools-1.0
+	>=dev-lang/ghc-7.4.1
+"
diff --git a/dev-haskell/hsb2hs/metadata.xml b/dev-haskell/hsb2hs/metadata.xml
new file mode 100644
index 000000000000..403deff9771e
--- /dev/null
+++ b/dev-haskell/hsb2hs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		hsb2hs is a preprocessor that allows you to include the contents of
+		files as string literals in your Haskell programs and libraries.
+		It is an alternative to file-embed for those who do not want to rely
+		on Template Haskell.  See @README.markdown@ for instructions.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
index cbc13507f7e7..5f5d2d5c2378 100644
--- a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild,v 1.1 2014/11/15 18:23:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild,v 1.2 2015/02/19 09:05:52 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
index acaf0aae3033..04a89c56f596 100644
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
+++ b/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild,v 1.3 2015/02/15 18:50:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild,v 1.4 2015/02/19 09:02:51 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
diff --git a/dev-haskell/nanospec/nanospec-0.2.0.ebuild b/dev-haskell/nanospec/nanospec-0.2.0.ebuild
index 41a2203ff997..2a34d5c452a1 100644
--- a/dev-haskell/nanospec/nanospec-0.2.0.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/nanospec/nanospec-0.2.0.ebuild,v 1.1 2014/07/02 11:46:16 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/nanospec/nanospec-0.2.0.ebuild,v 1.2 2015/02/19 09:04:43 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/preprocessor-tools/Manifest b/dev-haskell/preprocessor-tools/Manifest
new file mode 100644
index 000000000000..3814e0becb22
--- /dev/null
+++ b/dev-haskell/preprocessor-tools/Manifest
@@ -0,0 +1 @@
+DIST preprocessor-tools-1.0.1.tar.gz 9895 SHA256 c946c99fe8c9effba27946cd2c26173d2346340528d800a228796d68f8aeee59 SHA512 b039c763eda293950a73c089903bbc2f447b92740077c042a764c2523db581450c96e3fda7ae177336d96626283283843c93006eca73d02951ca9067a3b12665 WHIRLPOOL 5328ef4648f2778a39a089ad40c911203abc037d99a9850165f30225ad189f33a912f4c64087f2e5a5c4cb49a4a0efc587ebcfd72e7346317171c0b6991a124a
diff --git a/dev-haskell/preprocessor-tools/metadata.xml b/dev-haskell/preprocessor-tools/metadata.xml
new file mode 100644
index 000000000000..217bd1b1fb11
--- /dev/null
+++ b/dev-haskell/preprocessor-tools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		This library provides a quick-and-dirty (but often effective)
+		method for extending Haskell&#39;s syntax using a custom
+		preprocessor.  It parses Haskell into a bare-bones AST with just
+		enough knowledge of the syntax to preserve nesting, and then
+		allows transformations on the AST.
+		
+		See the package ixdopp
+		(&lt;http://hackage.haskell.org/cgi-bin/hackage-scripts/package/ixdopp&gt;)
+		for an example of how to do this.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild b/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
new file mode 100644
index 000000000000..2786daeb6231
--- /dev/null
+++ b/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild,v 1.2 2015/02/18 21:15:22 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A framework for extending Haskell's syntax via quick-and-dirty preprocessors"
+HOMEPAGE="http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	>=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2.3
+"
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
index 5e42929e75a3..677b15f74f5d 100644
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild,v 1.1 2014/07/02 12:34:42 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild,v 1.2 2015/02/19 09:07:59 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
index 0fdfb88d7eb9..fa2aeeea3c27 100644
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild,v 1.1 2014/03/12 20:48:55 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild,v 1.2 2015/02/19 09:04:48 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
index 0bcee0e66b72..18b2c15d9c3f 100644
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild,v 1.1 2014/07/02 13:08:51 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild,v 1.2 2015/02/19 09:07:23 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/stm:=[profile?]
diff --git a/dev-haskell/text-icu/text-icu-0.6.3.7-r1.ebuild b/dev-haskell/text-icu/text-icu-0.6.3.7-r1.ebuild
index 01a758388bfd..215bdae3e27a 100644
--- a/dev-haskell/text-icu/text-icu-0.6.3.7-r1.ebuild
+++ b/dev-haskell/text-icu/text-icu-0.6.3.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text-icu/text-icu-0.6.3.7-r1.ebuild,v 1.2 2014/12/25 17:31:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text-icu/text-icu-0.6.3.7-r1.ebuild,v 1.3 2015/02/19 09:04:23 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild
index 3349626f3f0e..7051dbc0bedf 100644
--- a/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild,v 1.1 2014/11/14 11:32:55 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild,v 1.2 2015/02/19 09:06:22 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Native APR library for Tomcat"
 SLOT="0"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 IUSE=""
 
diff --git a/dev-lang/clojure/Manifest b/dev-lang/clojure/Manifest
index 5f9b4966bc22..97e5d31befd4 100644
--- a/dev-lang/clojure/Manifest
+++ b/dev-lang/clojure/Manifest
@@ -1,5 +1,3 @@
-DIST clojure-1.2.0.zip 3586231 SHA256 1334773cb13793bdc0588de0fe5b5aec602bb98ca84858d7374b4e063864d207 SHA512 8c10533eef046d3dba1eb335d0febcdd22664cd428b24c35f860784efd7a699eba1b37808b99c0b8a584266e6c282f7c490cd49bcb7d7363c958f2499cfc41e2 WHIRLPOOL 6a325eceadd752d42b37a6e6adca7cceb4c49058c3af1e9a78e609b111e8e1cc34b53c356f04bf506b388415108209ec78934057b1de98c1d156a41f2021c09f
-DIST clojure-1.3.0.tar.gz 489200 SHA256 da719ca8600f75001362fefa6427ef14d0a64c3ddc220c79695c44abecdc4a18 SHA512 1078a94afe096bf5862ddda6bd1fccb14d2383151f575b32829e60f2252d94dda972f9e9ca76bf91bc215f51e6529bd895c3653df5d9fa65dbe69e4be519ecdd WHIRLPOOL f3182a533c8081acbafceb5cd41c8f55c053dae673cab8f52274ab357fdf2b8059a512205501f7221d540d60913e115193eeb4c5dd1b46e05ceb56223b465770
 DIST clojure-1.4.0.tar.gz 501302 SHA256 72e9b69367e5f825fe501629a7bf25d70632a6007751d2a9520be133879f42cd SHA512 618c0de641f2e718e8a0b1ce62a695e61d60a2fc52804018b4fc20caf6e7a99d88ed5af43f2e1f735fc8c19629382f0e53d010b1fca41ca1d4856cd59fadf329 WHIRLPOOL f77b0365e2f1180e0c43412dd0684e33699d7ec517b18af4694e3778cac74593a18de3843f214db5656d39c947a24839942472b5439b90c0c4391c275dd8e927
 DIST clojure-1.5.1.tar.gz 540021 SHA256 ee6cc9360e3545a35cdd6a9ae48b5f4034ef2eb2aaa19721df976078952a805b SHA512 8bc4b7098ec11a3cd4d077f32607c5d23118d5f84b88af69b2051c4dd5b17f28f092b77206fba87e23f1163d2d0f7a2c37b1b1ffa1bcfef3ad4c8f74695d71cd WHIRLPOOL e77d13a771903100a3fe6b0ade84375217c5b150498e727a7cef2d856a4004e640e0c95717fb67be6cae1fbab7611189a1f3999726f7bbec43968eef646dcb32
 DIST clojure-1.6.0.tar.gz 579154 SHA256 70b664b24bd8cc7bf0b5519cfa5fa98424eb3e23303fec04b24a03b8bc4f0b4a SHA512 52bf54d157dae77e71e53bac421daa1bca7ef55b837600c8b04751a545cbed0f04d3718543031d1e5b8ca43e2518d356082b9f8c029c2e318996450cfaee9c81 WHIRLPOOL b79b008773ad678e6418a719183c5b240ad0629d3a32384ec6e5979f0377ba2bd39768f27b71da815342bffbd8bdfa5b66cb24e90cf4f489273b33515f591509
diff --git a/dev-lang/clojure/clojure-1.2.0.ebuild b/dev-lang/clojure/clojure-1.2.0.ebuild
deleted file mode 100644
index dd6a01cef600..000000000000
--- a/dev-lang/clojure/clojure-1.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.2.0.ebuild,v 1.5 2010/11/24 19:58:37 darkside Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
-HOMEPAGE="http://clojure.org/"
-SRC_URI="http://github.com/downloads/clojure/clojure/${P}.zip"
-
-LICENSE="EPL-1.0"
-SLOT="1.2"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="source"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-java_prepare() {
-	rm -v ${PN}.jar || die "Failed to remove compile jar."
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar ${P/_/-}.jar
-	java-pkg_dolauncher  ${PN}-${SLOT} --main clojure.main
-	dodoc changes.txt readme.txt || die
-
-	if use source; then
-		local zip_name="${PN}-src.zip"
-		local zip_path="${T}/${zip_name}"
-		pushd src/jvm >/dev/null || die "Problem entering Java source directory"
-		zip -q -r ${zip_path} . -i '*.java'
-		popd >/dev/null
-		pushd src/clj >/dev/null || die "Problem entering Clojure source directory"
-		zip -q -r ${zip_path} . -i '*.clj'
-		popd >/dev/null
-
-		INSDESTTREE=${JAVA_PKG_SOURCESPATH} \
-			doins ${zip_path} || die "Failed to install source"
-
-		JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
-		java-pkg_do_write_
-	fi
-}
diff --git a/dev-lang/clojure/clojure-1.3.0.ebuild b/dev-lang/clojure/clojure-1.3.0.ebuild
deleted file mode 100644
index 86cf8639186e..000000000000
--- a/dev-lang/clojure/clojure-1.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.3.0.ebuild,v 1.3 2011/11/17 18:46:11 phajdan.jr Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
-HOMEPAGE="http://clojure.org/"
-SRC_URI="https://github.com/clojure/clojure/tarball/clojure-1.3.0 -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="1.3"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S=${WORKDIR}/clojure-clojure-6375f36
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar ${P/_/-}.jar
-	java-pkg_dolauncher  ${PN}-${SLOT} --main clojure.main
-	dodoc changes.txt readme.txt || die
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
index e6a3cfbc436a..3e668a147ad7 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild,v 1.2 2015/02/17 08:46:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild,v 1.3 2015/02/19 09:03:19 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
 
 LICENSE="boehm-gc"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs threads"
 
 DEPEND=">=dev-libs/libatomic_ops-7.4
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
index e7280aa6b5c8..7e05dfb46c74 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild,v 1.2 2015/02/17 08:45:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild,v 1.3 2015/02/19 09:03:23 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ivmai/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT boehm-gc 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${PN}-${MY_P}
diff --git a/dev-libs/libclc/libclc-0.0.1_pre20141027.ebuild b/dev-libs/libclc/libclc-0.0.1_pre20141027.ebuild
index 737950f942a5..1c375ad98139 100644
--- a/dev-libs/libclc/libclc-0.0.1_pre20141027.ebuild
+++ b/dev-libs/libclc/libclc-0.0.1_pre20141027.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20141027.ebuild,v 1.2 2015/02/18 15:55:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20141027.ebuild,v 1.3 2015/02/19 08:51:10 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -25,7 +25,7 @@ fi
 
 LICENSE="|| ( MIT BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/libevdev/libevdev-1.3.ebuild b/dev-libs/libevdev/libevdev-1.3.ebuild
index f23654a514b2..0acd40251721 100644
--- a/dev-libs/libevdev/libevdev-1.3.ebuild
+++ b/dev-libs/libevdev/libevdev-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevdev/libevdev-1.3.ebuild,v 1.3 2015/02/18 15:55:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevdev/libevdev-1.3.ebuild,v 1.4 2015/02/19 08:51:12 ago Exp $
 
 EAPI=5
 XORG_MULTILIB=yes
@@ -19,7 +19,7 @@ else
 fi
 
 RESTRICT="test" # Tests need to run as root.
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libsodium/libsodium-1.0.2.ebuild b/dev-libs/libsodium/libsodium-1.0.2.ebuild
index 25bc8803053c..489a25d6fafb 100644
--- a/dev-libs/libsodium/libsodium-1.0.2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsodium/libsodium-1.0.2.ebuild,v 1.3 2015/02/15 07:09:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsodium/libsodium-1.0.2.ebuild,v 1.5 2015/02/19 10:40:16 ago Exp $
 
 EAPI=5
 
@@ -12,15 +12,21 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom"
 
 src_configure() {
+	local myconf
+
+	# --disable-pie needed on x86, bug #512734
+	use x86 && myconf="${myconf} --disable-pie"
+
 	econf \
 		$(use_enable asm) \
 		$(use_enable minimal) \
 		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		${myconf}
 }
 
 src_install() {
diff --git a/dev-libs/wayland/wayland-1.6.1.ebuild b/dev-libs/wayland/wayland-1.6.1.ebuild
index 87ab235098da..424ada9ceb84 100644
--- a/dev-libs/wayland/wayland-1.6.1.ebuild
+++ b/dev-libs/wayland/wayland-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.6.1.ebuild,v 1.2 2015/02/18 15:56:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.6.1.ebuild,v 1.3 2015/02/19 08:51:15 ago Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
diff --git a/dev-libs/weston/weston-1.6.1.ebuild b/dev-libs/weston/weston-1.6.1.ebuild
index c095a13e4d15..c5953942ac8f 100644
--- a/dev-libs/weston/weston-1.6.1.ebuild
+++ b/dev-libs/weston/weston-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/weston/weston-1.6.1.ebuild,v 1.2 2015/02/18 15:56:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/weston/weston-1.6.1.ebuild,v 1.3 2015/02/19 08:51:18 ago Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ fi
 
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~arm-linux"
+KEYWORDS="amd64 ~arm x86 ~arm-linux"
 IUSE="colord dbus +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
 
 REQUIRED_USE="
diff --git a/dev-ml/cryptokit/cryptokit-1.10.ebuild b/dev-ml/cryptokit/cryptokit-1.10.ebuild
index 7fab6c9f1c29..4cc72fc48e6d 100644
--- a/dev-ml/cryptokit/cryptokit-1.10.ebuild
+++ b/dev-ml/cryptokit/cryptokit-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/cryptokit-1.10.ebuild,v 1.1 2015/01/07 11:31:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/cryptokit-1.10.ebuild,v 1.2 2015/02/19 09:03:28 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
 SRC_URI="http://forge.ocamlcore.org/frs/download.php/1493/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="zlib"
 
 DEPEND="zlib? ( >=sys-libs/zlib-1.1 )"
diff --git a/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild b/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
index fa3c08b10e27..f0bc4a615ac8 100644
--- a/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild,v 1.2 2014/11/28 17:10:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild,v 1.3 2015/02/19 09:03:58 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
 
 LICENSE="ZLIB GPL-2+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="cryptokit gtk ssl tk httpd +ocamlopt +pcre zip"
 RESTRICT="installsources"
 
diff --git a/dev-ml/ocurl/ocurl-0.6.1.ebuild b/dev-ml/ocurl/ocurl-0.6.1.ebuild
index 829b754f9719..11996d7661a5 100644
--- a/dev-ml/ocurl/ocurl-0.6.1.ebuild
+++ b/dev-ml/ocurl/ocurl-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocurl/ocurl-0.6.1.ebuild,v 1.1 2014/02/13 16:00:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocurl/ocurl-0.6.1.ebuild,v 1.2 2015/02/19 09:04:38 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ RDEPEND=">=net-misc/curl-7.9.8
 		>=dev-lang/ocaml-3.12:=[ocamlopt]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 src_compile()
 {
diff --git a/dev-ml/pomap/pomap-3.0.5.ebuild b/dev-ml/pomap/pomap-3.0.5.ebuild
index 84c44ff6b379..e3d6476d5f05 100644
--- a/dev-ml/pomap/pomap-3.0.5.ebuild
+++ b/dev-ml/pomap/pomap-3.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.5.ebuild,v 1.1 2014/12/01 08:56:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.5.ebuild,v 1.2 2015/02/19 09:06:47 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 DEPEND="|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="examples"
 
 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild
new file mode 100644
index 000000000000..1e18d9ea0d1c
--- /dev/null
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild,v 1.1 2015/02/19 01:06:19 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=PHRED
+MODULE_VERSION=1.45
+inherit perl-module
+
+DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	>=virtual/perl-Compress-Raw-Zlib-2.17
+	>=virtual/perl-File-Spec-0.800.0
+"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index 9b8b5fef8e71..98c7e2722eb9 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -1,2 +1,3 @@
 DIST Archive-Zip-1.30.tar.gz 197179 SHA256 f8b472ff77b7238e423bcb351968accc562f9d20700fbf2d8ed2a65fa0fa6318 SHA512 ae717225c54013eb5759982fff5491a8a590a4666b3a93895270c89f361fe289094a35d0caf57320d36fa8f3f5e0c778045a099d0a024f2606c700f0aff3b4e7 WHIRLPOOL 9511cc57941aa8d5367f5041130c27025e90055fa65be6b3ad361d99a07adc9eb9ca9edec00b97fa86478d6b19ab6e604259eab218f9c7e5a0d863771f2a29b8
 DIST Archive-Zip-1.37.tar.gz 184345 SHA256 ba789436dc82db02a7f3d2e9d120d0221edc83d8c7ec72519648ae64bbc4ce05 SHA512 416dc16286edef085a9fd11b3f98c3abf6345a70552cf4f0d4e0da364b39d400cb259a09f1b33b82ff4aa6494a88e85e59afd80a94ae8446c329eb8a3af63ef1 WHIRLPOOL 07103e2d5a2f23e911b9bc9b3e784e21645864f2e6b08042c577deeaf5b27799c3df0fc8c2a89dfc805840ac0349e88053b173e8db51aefacb2dc7e225d5a8d1
+DIST Archive-Zip-1.45.tar.gz 186378 SHA256 bc423f96ee07512c968fa788eeccf4b0100f0c4b85f0cacc638b0d658f2f7c7c SHA512 53831db7dd17d3418c593a9961679bfc6cfe067b1f31794664bc60439b332a2e054e8145a156e3eae95f6712dd8cbcc44ed29d7ae8a4fa0f4f1b97ea924e88d4 WHIRLPOOL c71e4c5a05da18ac1f69fccd5b2c35385818bc827d029f1483c7bb07f342def9b1a1a2593fc870c8b30104d4117ff95b2b5316a454f9b0722656bb9e25a7ce6e
diff --git a/dev-php/suhosin/suhosin-0.9.37.1.ebuild b/dev-php/suhosin/suhosin-0.9.37.1.ebuild
index 057f9120a80c..9c088961ee69 100644
--- a/dev-php/suhosin/suhosin-0.9.37.1.ebuild
+++ b/dev-php/suhosin/suhosin-0.9.37.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.37.1.ebuild,v 1.2 2015/02/17 18:04:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.37.1.ebuild,v 1.3 2015/02/19 09:08:19 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ USE_PHP="php5-6 php5-5 php5-4"
 
 inherit php-ext-source-r2
 
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
 HOMEPAGE="http://www.suhosin.org/"
diff --git a/dev-php/xdebug-client/xdebug-client-2.2.6.ebuild b/dev-php/xdebug-client/xdebug-client-2.2.6.ebuild
index a300422a933c..ed484aaa9a96 100644
--- a/dev-php/xdebug-client/xdebug-client-2.2.6.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.2.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 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.6.ebuild,v 1.1 2015/01/04 03:50:03 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug-client/xdebug-client-2.2.6.ebuild,v 1.2 2015/02/19 09:05:08 ago Exp $
 
 EAPI=5
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
diff --git a/dev-php/xdebug/xdebug-2.2.6.ebuild b/dev-php/xdebug/xdebug-2.2.6.ebuild
index f8cd8912d262..b56a87afc42e 100644
--- a/dev-php/xdebug/xdebug-2.2.6.ebuild
+++ b/dev-php/xdebug/xdebug-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.6.ebuild,v 1.2 2015/01/15 09:03:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.6.ebuild,v 1.3 2015/02/19 09:05:04 ago Exp $
 
 EAPI="5"
 PHP_EXT_NAME="xdebug"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 inherit php-ext-source-r2
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="http://www.xdebug.org/"
diff --git a/dev-python/Kivy/Kivy-1.8.0.ebuild b/dev-python/Kivy/Kivy-1.8.0.ebuild
index 685b514733d0..579137b1ffa4 100644
--- a/dev-python/Kivy/Kivy-1.8.0.ebuild
+++ b/dev-python/Kivy/Kivy-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.5 2015/01/01 21:23:06 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.6 2015/02/19 07:30:03 slis Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ IUSE="cairo camera doc examples garden gstreamer spell"
 
 DEPEND="dev-python/cython
 	garden? ( dev-python/kivy-garden )
-	gstreamer? ( dev-python/gst-python )
+	gstreamer? ( dev-python/gst-python:1.0 )
 	cairo? ( dev-python/pycairo )
 	spell? ( dev-python/pyenchant )
 	dev-python/pygame
@@ -32,6 +32,9 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	sed -e '/data_files=/d' -i "${S}/setup.py"
 	epatch "${FILESDIR}/cython-fixes.patch"
+	if has_version '>=dev-python/cython-0.22' ; then
+	    epatch "${FILESDIR}/cython-0.22.patch"
+	fi
 }
 
 src_install() {
diff --git a/dev-python/Kivy/files/cython-0.22.patch b/dev-python/Kivy/files/cython-0.22.patch
new file mode 100644
index 000000000000..9b125f9ad648
--- /dev/null
+++ b/dev-python/Kivy/files/cython-0.22.patch
@@ -0,0 +1,139 @@
+--- kivy/graphics.orig/shader.pyx	2015-02-19 07:27:13.062070969 +0100
++++ kivy/graphics/shader.pyx	2015-02-19 07:27:22.838737743 +0100
+@@ -221,13 +221,13 @@
+         '''
+         glUseProgram(0)
+ 
+-    cdef void set_uniform(self, str name, value):
++    cdef void set_uniform(self, str name, value) except *:
+         if name in self.uniform_values and self.uniform_values[name] == value:
+             return
+         self.uniform_values[name] = value
+         self.upload_uniform(name, value)
+ 
+-    cdef void upload_uniform(self, str name, value):
++    cdef void upload_uniform(self, str name, value) except *:
+         '''Pass a uniform variable to the shader.
+         '''
+         cdef long vec_size, index, x, y
+@@ -412,7 +412,7 @@
+             mat[x] = <GLfloat>value.mat[x]
+         glUniformMatrix4fv(loc, 1, False, mat)
+ 
+-    cdef int get_uniform_loc(self, str name):
++    cdef int get_uniform_loc(self, str name) except *:
+         cdef bytes c_name = name.encode('utf-8')
+         cdef int loc = glGetUniformLocation(self.program, c_name)
+         self.uniform_locations[name] = loc
+@@ -453,11 +453,11 @@
+         # save for the next run.
+         self._current_vertex_format = vertex_format
+ 
+-    cdef void build(self):
++    cdef void build(self) except *:
+         self.build_vertex()
+         self.build_fragment()
+ 
+-    cdef void build_vertex(self, int link=1):
++    cdef void build_vertex(self, int link=1) except *:
+         if self.vertex_shader is not None:
+             glDetachShader(self.program, self.vertex_shader.shader)
+             self.vertex_shader = None
+@@ -467,7 +467,7 @@
+         if link:
+             self.link_program()
+ 
+-    cdef void build_fragment(self, int link=1):
++    cdef void build_fragment(self, int link=1) except *:
+         if self.fragment_shader is not None:
+             glDetachShader(self.program, self.fragment_shader.shader)
+             self.fragment_shader = None
+@@ -477,7 +477,7 @@
+         if link:
+             self.link_program()
+ 
+-    cdef void link_program(self):
++    cdef void link_program(self) except *:
+         if self.vertex_shader is None or self.fragment_shader is None:
+             return
+ 
+--- kivy/graphics.orig/instructions.pyx	2015-02-19 07:27:13.062070969 +0100
++++ kivy/graphics/instructions.pyx	2014-01-20 03:49:50.000000000 +0100
+@@ -233,15 +233,15 @@
+         if self.context_pop:
+             context.pop_states(self.context_pop)
+ 
+-    cdef void set_state(self, str name, value):
++    cdef void set_state(self, str name, value) except *:
+         self.context_state[name] = value
+         self.flag_update()
+ 
+-    cdef void push_state(self, str name):
++    cdef void push_state(self, str name) except *:
+         self.context_push.append(name)
+         self.flag_update()
+ 
+-    cdef void pop_state(self, str name):
++    cdef void pop_state(self, str name) except *:
+         self.context_pop.append(name)
+         self.flag_update()
+ 
+@@ -764,29 +764,29 @@
+     cdef get_state(self, str name):
+         return self.state_stacks[name][-1]
+ 
+-    cdef void set_states(self, dict states):
++    cdef void set_states(self, dict states) except *:
+         cdef str name
+         for name, value in states.iteritems():
+             self.set_state(name, value)
+ 
+-    cdef void push_state(self, str name):
++    cdef void push_state(self, str name) except *:
+         stack = self.state_stacks[name]
+         stack.append(stack[-1])
+         self.flag_update()
+ 
+-    cdef void push_states(self, list names):
++    cdef void push_states(self, list names) except *:
+         cdef str name
+         for name in names:
+             self.push_state(name)
+ 
+-    cdef void pop_state(self, str name):
++    cdef void pop_state(self, str name) except *:
+         stack = self.state_stacks[name]
+         oldvalue = stack.pop()
+         if oldvalue != stack[-1]:
+             self.set_state(name, stack[-1])
+             self.flag_update()
+ 
+-    cdef void pop_states(self, list names):
++    cdef void pop_states(self, list names) except *:
+         cdef str name
+         for name in names:
+             self.pop_state(name)
+@@ -806,10 +806,10 @@
+         texture.bind()
+         self.flag_update()
+ 
+-    cdef void enter(self):
++    cdef void enter(self) except *:
+         self._shader.use()
+ 
+-    cdef void leave(self):
++    cdef void leave(self) except *:
+         self._shader.stop()
+ 
+     cdef void apply(self):
+--- kivy/graphics.orig/instructions.pxd	2015-02-19 07:44:16.315415541 +0100
++++ kivy/graphics/instructions.pxd  2014-01-20 03:49:50.000000000 +0100
+@@ -115,7 +115,7 @@
+     cdef void pop_states(self, list names) except *
+     cdef void enter(self) except *
+     cdef void leave(self) except *
+-    cdef void apply(self) except *
++    cdef void apply(self)
+     cpdef draw(self)
+     cdef void reload(self)
+ 
diff --git a/dev-python/blessings/blessings-1.6.ebuild b/dev-python/blessings/blessings-1.6.ebuild
index fc6d4f977bd0..ae3c14dc0840 100644
--- a/dev-python/blessings/blessings-1.6.ebuild
+++ b/dev-python/blessings/blessings-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/blessings/blessings-1.6.ebuild,v 1.1 2015/02/17 12:36:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blessings/blessings-1.6.ebuild,v 1.2 2015/02/19 08:07:55 jlec Exp $
 
 EAPI=5
 
@@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+RDEPEND=""
 
 python_test() {
 	nosetests --verbosity=3 ${PN} || die
diff --git a/dev-python/boto/boto-2.35.1.ebuild b/dev-python/boto/boto-2.35.1.ebuild
index 6cbaf565bb06..eecc06130754 100644
--- a/dev-python/boto/boto-2.35.1.ebuild
+++ b/dev-python/boto/boto-2.35.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.35.1.ebuild,v 1.2 2015/01/10 06:17:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.35.1.ebuild,v 1.3 2015/02/19 09:08:29 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/bpython/bpython-0.14.ebuild b/dev-python/bpython/bpython-0.14.ebuild
index 3f016240689a..c88608f69350 100644
--- a/dev-python/bpython/bpython-0.14.ebuild
+++ b/dev-python/bpython/bpython-0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.14.ebuild,v 1.2 2015/02/18 18:32:34 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.14.ebuild,v 1.3 2015/02/19 09:14:50 grozin Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk test"
+IUSE="doc test"
 
 RDEPEND="
 	dev-python/curtsies[${PYTHON_USEDEP}]
@@ -32,10 +32,6 @@ RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/watchdog[${PYTHON_USEDEP}]
-	gtk? (
-		dev-python/pygobject:2[$(python_gen_usedep python2_7)]
-		dev-python/pygtk[$(python_gen_usedep python2_7)]
-		)
 	"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
@@ -57,20 +53,8 @@ python_compile_all() {
 	fi
 }
 
-python_install() {
-	distutils-r1_python_install
-	if ! use gtk; then
-		rm -f "${D}"usr/bin/bpython-gtk*
-		# delete_unneeded_modules() {
-		rm -f "${D}$(python_get_sitedir)/bpython/gtk_.py"
-	fi
-}
-
 python_test() {
 	pushd build/lib > /dev/null
-	# https://bitbucket.org/bobf/bpython/issue/289/test-failures-in-latest-release-py27-py33
-	sed -e s':test_enter:_&:' -i bpython/test/test_repl.py || die
-
 	"${PYTHON}" -m unittest discover || die
 	popd > /dev/null
 }
diff --git a/dev-python/jsonschema/jsonschema-2.3.0.ebuild b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
index fb622ac5dcb7..7ecc55c4bca8 100644
--- a/dev-python/jsonschema/jsonschema-2.3.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonschema/jsonschema-2.3.0.ebuild,v 1.5 2014/07/06 12:42:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonschema/jsonschema-2.3.0.ebuild,v 1.6 2015/02/19 10:40:42 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python{2_6,2_7,3_{2,3,4}} pypy pypy2_0)
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 python_test() {
diff --git a/dev-python/pgasync/pgasync-2.01-r1.ebuild b/dev-python/pgasync/pgasync-2.01-r1.ebuild
index e77735e99183..9ecf69b83ef5 100644
--- a/dev-python/pgasync/pgasync-2.01-r1.ebuild
+++ b/dev-python/pgasync/pgasync-2.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pgasync/pgasync-2.01-r1.ebuild,v 1.1 2015/01/07 11:21:07 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pgasync/pgasync-2.01-r1.ebuild,v 1.2 2015/02/19 09:08:24 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.jamwt.com/pgasync/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 DEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]"
diff --git a/dev-python/prettytable/prettytable-0.7.1-r1.ebuild b/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
index a6a75bebfbcd..44119aff8484 100644
--- a/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.7.1-r1.ebuild,v 1.3 2014/11/24 15:16:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.7.1-r1.ebuild,v 1.4 2015/02/19 10:39:51 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -14,7 +14,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyode/pyode-1.2.0_p20100322.ebuild b/dev-python/pyode/pyode-1.2.0_p20100322.ebuild
deleted file mode 100644
index cea3a079541a..000000000000
--- a/dev-python/pyode/pyode-1.2.0_p20100322.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.2.0_p20100322.ebuild,v 1.5 2011/04/14 20:33:21 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_P="${P/pyode/PyODE}"
-SNAPSHOT_DATE="2010-03-22"	# This is a snapshot
-
-DESCRIPTION="Python bindings to the ODE physics engine"
-HOMEPAGE="http://pyode.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/PyODE-snapshot-${SNAPSHOT_DATE}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="examples"
-
-RDEPEND=">=dev-games/ode-0.7
-	>=dev-python/pyrex-0.9.4.1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/PyODE-snapshot-${SNAPSHOT_DATE}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-PYTHON_MODNAME="xode"
-
-src_install() {
-	distutils_src_install
-	# The build system doesnt error if it fails to build
-	# the ode library so we need our own sanity check
-	[[ -z $(find "${D}" -name ode.so) ]] && die "failed to build/install :("
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		doins -r examples
-	fi
-}
diff --git a/dev-qt/qt-creator/qt-creator-3.3.0.ebuild b/dev-qt/qt-creator/qt-creator-3.3.0.ebuild
index 55269e59a95c..0f4213d2ba3e 100644
--- a/dev-qt/qt-creator/qt-creator-3.3.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild,v 1.4 2015/02/18 18:31:41 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild,v 1.5 2015/02/18 19:05:28 pesa Exp $
 
 EAPI=5
 
@@ -42,7 +42,7 @@ RDEPEND="
 	>=dev-qt/designer-${QT_PV}
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
 	>=dev-qt/qtgui-${QT_PV}
 	>=dev-qt/qthelp-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}[ssl]
diff --git a/dev-ruby/drydock/Manifest b/dev-ruby/drydock/Manifest
deleted file mode 100644
index 5e279fb64fa6..000000000000
--- a/dev-ruby/drydock/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST drydock-0.6.9.gem 23040 SHA256 d2bbd5be1ba4dde949e7eeca15e64c97ad77a853dc56493fa323c11acc182e3f SHA512 f1775c1f6e1f242306a36397b914a510c823ad404926d2e9176202e66903da57ed8810472725cc9762859636385adbfc4c4d46906a3d9126b81e81b7581e3551 WHIRLPOOL 3faefb003ba89e2e6f5710e35c168ef241a4e745c595be7b67474570021491624c7be3a5d170b0e4d3f825263704f9fdca9b13b4770ec01686dda5fe5adacdb2
diff --git a/dev-ruby/drydock/drydock-0.6.9.ebuild b/dev-ruby/drydock/drydock-0.6.9.ebuild
deleted file mode 100644
index 6cacf9e9aafa..000000000000
--- a/dev-ruby/drydock/drydock-0.6.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/drydock/drydock-0.6.9.ebuild,v 1.5 2014/11/30 07:58:52 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RESTRICT=test
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="DSL for building really powerful command line applications"
-HOMEPAGE="http://solutious.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/drydock/metadata.xml b/dev-ruby/drydock/metadata.xml
deleted file mode 100644
index 852136183369..000000000000
--- a/dev-ruby/drydock/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>ruby</herd>
-</pkgmetadata>
diff --git a/dev-ruby/facter/facter-2.4.1.ebuild b/dev-ruby/facter/facter-2.4.1.ebuild
index 180121aee2d1..60efcfbbf30f 100644
--- a/dev-ruby/facter/facter-2.4.1.ebuild
+++ b/dev-ruby/facter/facter-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1.ebuild,v 1.6 2015/02/18 09:16:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1.ebuild,v 1.7 2015/02/19 10:40:01 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+dmi +pciutils +virt"
-KEYWORDS="~amd64 hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc ~x86"
 
 CDEPEND="
 	app-emulation/virt-what
diff --git a/dev-ruby/flickr/Manifest b/dev-ruby/flickr/Manifest
deleted file mode 100644
index a5e35ecb4caf..000000000000
--- a/dev-ruby/flickr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST flickr-1.0.2-gentoo.tar.bz2 7693 SHA256 34f20dee5b8681f3850bd080e318ad40e7a4c059bc6f50da402576b3675510ca SHA512 d78a43d6ba44c726fc0ab7b99b8c072d46197b40c4e8654b3d58021786fe8dd4e31afab982cabc57b62e623f41672e20301b9b57f42e0c788d2e9a870ce6215c WHIRLPOOL 1a115116bc47515dc6a7c53ba33c3d60621445c76182fdef975add7f99135b3db3ecc571d19aaf024cc2011eb4fc4b55de537edea3bb56a71c51925e0e45aba9
diff --git a/dev-ruby/flickr/files/flickr-1.0.2-fix.patch b/dev-ruby/flickr/files/flickr-1.0.2-fix.patch
deleted file mode 100644
index 6b9a8add1706..000000000000
--- a/dev-ruby/flickr/files/flickr-1.0.2-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: flickr-1.0.2-gentoo/lib/flickr.rb
-===================================================================
---- flickr-1.0.2-gentoo.orig/lib/flickr.rb
-+++ flickr-1.0.2-gentoo/lib/flickr.rb
-@@ -64,7 +64,7 @@ class Flickr
-   # Takes a Flickr API method name and set of parameters; returns an XmlSimple object with the response
-   def request(method, *params)
-     response = XmlSimple.xml_in(http_get(request_url(method, params)), { 'ForceArray' => false })
--    raise response['err']['msg'] if response['stat'] != 'ok'
-+    raise (response['err']['msg'] + "API key #{@api_key}") if response['stat'] != 'ok'
-     response
-   end
-   
-@@ -167,14 +167,14 @@ class Flickr
-     
-     attr_reader :client, :id, :name, :location, :photos_url, :url, :count, :firstdate, :firstdatetaken
- 
--    def initialize(id=nil, username=nil, email=nil, password=nil, api_key=nil)
-+    def initialize(id=nil, api_key=nil, username=nil, email=nil, password=nil)
-       @id = id
-+      @api_key = api_key
-       @username = username
-       @email = email
-       @password = password
-       @client = Flickr.new @api_key
-       @client.login(email, password) if email and password
--      @api_key = api_key
-     end
- 
-     def username
diff --git a/dev-ruby/flickr/files/flickr-1.0.2-typo.patch b/dev-ruby/flickr/files/flickr-1.0.2-typo.patch
deleted file mode 100644
index 0a54953398cb..000000000000
--- a/dev-ruby/flickr/files/flickr-1.0.2-typo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Frédéric de Villamil <frederic@de-villamil.com>
-Date:   Sun Jun 28 15:01:05 2009 +0200
-
-    Fixing a bug where vendor/flickr/flickr.rb could not handle 302 response. Closes ticket #106
-
-diff --git a/vendor/flickr/flickr.rb b/vendor/flickr/flickr.rb
-index 4728132..a5e5352 100644
---- a/vendor/flickr/flickr.rb
-+++ b/vendor/flickr/flickr.rb
-@@ -45,8 +45,8 @@
- #  - make a kickass demo, including autocompleting-ajax photo lookup ala http://mir.aculo.us/images/autocomplete1.mov
- 
- require 'cgi'
--require 'net/http'
-+require 'open-uri'
- require 'xmlsimple'
- 
- # Flickr client class. Requires an API key, and optionally takes an email and password for authentication
- class Flickr
-@@ -78,7 +78,7 @@ class Flickr
-   
-   # Does an HTTP GET on a given URL and returns the response body
-   def http_get(url)
--    Net::HTTP.get_response(URI.parse(url)).body.to_s
-+    open(URI.parse(url)) {|h| h.read }
-   end
- 
-   # Stores authentication credentials to use on all subsequent calls.
-@@ -318,7 +318,7 @@ class Flickr
- 
-     # Returns the photo file data itself, in any specified size. Example: File.open(photo.title, 'w') { |f| f.puts photo.file }
-     def file(size='Medium')
--      Net::HTTP.get_response(URI.parse(source(size))).body
-+      open(URI.parse(source(size))) {|h| h.read }
-     end
- 
-     # Unique filename for the image, based on the Flickr NSID
diff --git a/dev-ruby/flickr/flickr-1.0.2-r5.ebuild b/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
deleted file mode 100644
index 6172914eb2c0..000000000000
--- a/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/flickr-1.0.2-r5.ebuild,v 1.6 2014/10/30 14:04:21 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-# Tests require a flickr API key.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An insanely easy interface to the Flickr photo-sharing service"
-HOMEPAGE="http://rubyforge.org/projects/flickr/"
-SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
-
-RUBY_S="${P}-gentoo"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/xml-simple"
-
-all_ruby_prepare() {
-	cd lib || die
-	epatch "${FILESDIR}/${P}-fix.patch"
-	epatch "${FILESDIR}/${P}-typo.patch"
-}
diff --git a/dev-ruby/flickr/metadata.xml b/dev-ruby/flickr/metadata.xml
deleted file mode 100644
index 852136183369..000000000000
--- a/dev-ruby/flickr/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>ruby</herd>
-</pkgmetadata>
diff --git a/dev-ruby/gemcutter/Manifest b/dev-ruby/gemcutter/Manifest
deleted file mode 100644
index af6cb70bd9d0..000000000000
--- a/dev-ruby/gemcutter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gemcutter-0.7.1-git.tgz 7612 SHA256 f21bfa298d3a180517279098da0e54e7ef360ef9fd3a959fab092603c7269e20 SHA512 91f4f37caa9d2fd54721bb967ebfdec416c302d02a0e240abb4c929263335b49bd255a3c486429038939c7b6dcaaab3e3fc5fe2d7f4102bf4bd92147351b085f WHIRLPOOL a18a2a8e25d855ed707012837d62445176538e0d4346a4d5ee0dd8693a4450f7f9a144321b6a5a688c56c4becebcb5cc273d7c61388ceca308dc64881071b461
diff --git a/dev-ruby/gemcutter/gemcutter-0.7.1.ebuild b/dev-ruby/gemcutter/gemcutter-0.7.1.ebuild
deleted file mode 100644
index c2175583a53d..000000000000
--- a/dev-ruby/gemcutter/gemcutter-0.7.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gemcutter/gemcutter-0.7.1.ebuild,v 1.3 2014/08/05 16:00:41 mrueg Exp $
-
-EAPI=4
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides the gem yank and gem webhook commands to RubyGems"
-HOMEPAGE="http://github.com/rubygems/gemcutter"
-SRC_URI="https://github.com/rubygems/gemcutter/tarball/v${PV} -> ${P}-git.tgz"
-RUBY_S="rubygems-gemcutter-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/shoulda
-		>=dev-ruby/webmock-1.4.0
-		dev-ruby/rr
-		dev-ruby/activesupport
-		dev-ruby/i18n
-		dev-ruby/bundler
-	)"
-
-each_ruby_test() {
-	# Tests fail unless being run through bundler.
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/gemcutter/metadata.xml b/dev-ruby/gemcutter/metadata.xml
deleted file mode 100644
index 852136183369..000000000000
--- a/dev-ruby/gemcutter/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>ruby</herd>
-</pkgmetadata>
diff --git a/dev-ruby/net-dns/Manifest b/dev-ruby/net-dns/Manifest
deleted file mode 100644
index a08b3ddcc0c8..000000000000
--- a/dev-ruby/net-dns/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST net-dns-0.8.0.gem 50688 SHA256 c92df500b1c704bfbfed608f8b196c6fd50353c9b8eb8bd9bae0f906b7a1ca8a SHA512 734fdfaa487ac551acdc9c790560cd19e84886b12b07b932a94473cfa473cfd3d4fd91ea9679ee0082ae772fe6cef2d09a0b3511b842c0f0e9ba858771df726e WHIRLPOOL c71d9db3a207ac52414bfb7f14c9a5c1871ce17b6e3f9877e3418e5119ce95177acb5a439b9a8d187f346adab2307ac6bfa8edf183a64d80cbd23687ca093c9c
diff --git a/dev-ruby/net-dns/metadata.xml b/dev-ruby/net-dns/metadata.xml
deleted file mode 100644
index 852136183369..000000000000
--- a/dev-ruby/net-dns/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>ruby</herd>
-</pkgmetadata>
diff --git a/dev-ruby/net-dns/net-dns-0.8.0.ebuild b/dev-ruby/net-dns/net-dns-0.8.0.ebuild
deleted file mode 100644
index 17e7ca930767..000000000000
--- a/dev-ruby/net-dns/net-dns-0.8.0.ebuild
+++ /dev/null
@@ -1,34 +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/net-dns/net-dns-0.8.0.ebuild,v 1.3 2014/11/18 12:07:47 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC="yardoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md THANKS.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="DNS resolver in pure Ruby"
-HOMEPAGE="http://net-dns.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/git ls-files/d' Rakefile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc demo/* || die
-}
diff --git a/dev-ruby/patron/patron-0.4.18-r2.ebuild b/dev-ruby/patron/patron-0.4.18-r2.ebuild
index 17e5681d5938..823c5b1aee5b 100644
--- a/dev-ruby/patron/patron-0.4.18-r2.ebuild
+++ b/dev-ruby/patron/patron-0.4.18-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/patron/patron-0.4.18-r2.ebuild,v 1.3 2014/08/15 14:03:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/patron/patron-0.4.18-r2.ebuild,v 1.4 2015/02/19 07:19:01 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 RUBY_FAKEGEM_EXTRADOC="README.txt"
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index d3aec218f02b..547cfbe8f385 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -1,4 +1,3 @@
-DIST psych-2.0.10.gem 126976 SHA256 69c10325171ffba7d5b2669bc84519804c0a4498dad8bf08f149a1bd2642f21e SHA512 15252b53f28bdf781f84ddc53dc7ef591e7ebfda3a556ed9c3b326df343726e619b5a553ef38621b167a31cbc64fb8960547f52445be513a7eb1dd5603b7696c WHIRLPOOL 7841cf460c65bb83f5e0e0c334d17ba5dc4c8e43c19d2c7085f04274cded7c162af336de9ff93c10602b5b3047dd77c279a1a9a947383f57cb02cf47aa578b9b
 DIST psych-2.0.11.gem 126976 SHA256 9a0f04a59098c7a16495f03d88421bf2edf9067f2a37c4026bb82eb069ef465e SHA512 1162f2294adb1ce5c195b21a6a7e6ff6f5bdaa3690d9a59e6f97eb93f3ea728726f72c4d6dfe462d1c91fe39ca8d70ca570393b71e5389e5f50a2eb7278687b7 WHIRLPOOL 3b4d72d7ab6f97c9e05182d9a48be1348c716e0c75f0143c169fa8064c0e5bb09efc218fe191f7fb1957ca918ae970fb46c46817fbec1583ab8a089be4e5e2c3
 DIST psych-2.0.12.gem 127488 SHA256 879990cb62844898fec506f1aa7012ddb87c55ce8f7bbc89fc607e2ff638aa87 SHA512 8e6d54b390efba0bcb77f04a16e7724311d83e1e6f1e18f01c9fb6cd87971f823c5c4b9c14232b749c04a446ab00a57fe7baa4712a1d43346ee3d72d351fcbe6 WHIRLPOOL 20864a8d1f6512548c33aab8979087ec9596b3a162f22ca64932d2bfa91ddb78e89b35c36462e7c5b1674ac36c1fdd0c210b91ae3ff40108af0e9d4c2ee26996
-DIST psych-2.0.9.gem 126976 SHA256 3e32440c4262e421a7b0c23cf1739530ed152f8da191ecf0c8245be3923f3ce6 SHA512 2c0cec4c16e37f6b6420daecac4e1d1023d52674be1f431c76b744e62a1c15c74b2dde4c27d0cf5306e060d3562fc08d0f96ab23f344dbe7ab154cc7c2bdc01e WHIRLPOOL 679eccc1f69320c3e1e36ee3401c1d64380102d14c7a237ad8026b5c60258f7cf09ca2b9563911f2a1015411902f2a78956be484cd255dced7208066e0ccc7a5
+DIST psych-2.0.13.gem 127488 SHA256 731e44df80f1fbe28b7d753830b138f2100c7cb9ff52137a061c151af474fdb5 SHA512 d2b54408c3860f7260022d091fbeb8daeec1a206ba5e99c8f2677f68112c24f4bad85c37244b6f6e6efd55e429499f6750b29102aa1c1c79ba1da4963690b9e9 WHIRLPOOL 6f6eb86dbcea7b867778ebf19593521e01f75b0f61325704d921bfc9de570f90d6a52c63cada8c5d41b495dc5b31900d757efe820acbd9d32a259048b31221e6
diff --git a/dev-ruby/psych/psych-2.0.10.ebuild b/dev-ruby/psych/psych-2.0.10.ebuild
deleted file mode 100644
index feb14beecf33..000000000000
--- a/dev-ruby/psych/psych-2.0.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/psych/psych-2.0.10.ebuild,v 1.1 2015/01/18 03:06:39 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A libyaml wrapper for Ruby"
-HOMEPAGE="https://github.com/tenderlove/psych"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libyaml-0.1.6"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-4.0:0 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "minitest", "~>4.0"' test/psych/helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:test/${PN} -S testrb test/${PN}/test_*.rb test/${PN}/{nodes,visitors,json}/test_*.rb || die
-}
diff --git a/dev-ruby/psych/psych-2.0.9.ebuild b/dev-ruby/psych/psych-2.0.13.ebuild
similarity index 62%
rename from dev-ruby/psych/psych-2.0.9.ebuild
rename to dev-ruby/psych/psych-2.0.13.ebuild
index 8dccba16e02f..724afae486d4 100644
--- a/dev-ruby/psych/psych-2.0.9.ebuild
+++ b/dev-ruby/psych/psych-2.0.13.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/psych/psych-2.0.9.ebuild,v 1.1 2015/01/10 22:01:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/psych/psych-2.0.13.ebuild,v 1.1 2015/02/19 07:00:36 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
@@ -20,10 +20,10 @@ IUSE=""
 
 DEPEND+=" >=dev-libs/libyaml-0.1.6"
 
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-4.0:0 )"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
 
 all_ruby_prepare() {
-	sed -i -e '1igem "minitest", "~>4.0"' test/psych/helper.rb || die
+	sed -i -e '1igem "minitest", "~>5.0"' test/psych/helper.rb || die
 }
 
 each_ruby_configure() {
@@ -36,5 +36,5 @@ each_ruby_compile() {
 }
 
 each_ruby_test() {
-	${RUBY} -Ilib:test:test/${PN} -S testrb test/${PN}/test_*.rb test/${PN}/{nodes,visitors,json}/test_*.rb || die
+	${RUBY} -Ilib:test:test/${PN}:. -e "Dir['test/psych/**/test_*.rb'].each {|f| require f}" || die
 }
diff --git a/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild b/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild
index 32452050aba7..e936b1c29538 100644
--- a/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild,v 1.2 2014/11/11 10:46:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild,v 1.3 2015/02/19 07:22:22 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY README.*"
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index ac3a8aa6aba8..57499f5d7a37 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,4 +1,3 @@
-DIST ruby_parser-2.3.1.gem 80384 SHA256 d9a4daeb41da89db62c6ba4d31facedac7b181fa5c3ba20b4256bad8cb4fc434 SHA512 2451451cc1ba0b0c4c954d3e208b46c952dbbd7f901948084d192af96f04cc4eae8fdac92e035491daecb150a2e50a38a20af00c011f0bc68b1a962e42b95997 WHIRLPOOL 85b4c13fd3bef0ca1fcdbc91cd04692944d7f6efd23370590fe538b1cfbbbe1365d7bf24b7a783d11a8184143fd7fc2fd68eb404df160bef80fdf5e17f234280
 DIST ruby_parser-3.1.3.gem 141824 SHA256 602b23bfde88e1cdcef113fd013ebf3735b06454372b3c9b5a5c14a5b161fa34 SHA512 e7e5649966a3d5e5f29b018b53d36dd8c33b9d5c14daa695995ed153a01cae90854e7bf6a2164b6b40f17e0e52391a9653f204b74ae9cc155b4c6c55a07c9b83 WHIRLPOOL b421a7696dafcdf7dfacd11bc933010190c3d6ce47b3ddbe8c9817c1f0557d0892d6bcd5fc575236eae43c13523e0163766ad6df31f3941874053a3f6296a84a
 DIST ruby_parser-3.6.3.gem 250368 SHA256 926434eea57cfd15e0554fe0ae8e769656fc18e75024b0b3f44e166711540d88 SHA512 47f306b183a9ded94e64896cc2fa6f12bc9dd879c5665cd1950f643aeeae24bc3327e704b60880b8d473a5f71f12825c38555c2d4771072c15fe177bd1dce310 WHIRLPOOL 82354fceda3896298a6e6473c46063e951c62461553a0a965e7a00c762f0202b8193eeda168f771529b04cbd8fb7af75bb8ca9869e9bd2dee0391984760730f4
 DIST ruby_parser-3.6.4.gem 250368 SHA256 f4ded7729953ade0779ed970d58cbbcc421a2123b193a6517f1b3c20ae2ed472 SHA512 c006893e67928ed54a8bbeb9a6ee85aad33643865f53ed318079aa54d630a9d2386539a413fed184d9d94cc9e3ddbcc81098a0d23b8f4b5222ca1a65223aab3f WHIRLPOOL 440ca0a3ad59e4959371c14dcc1113c723b61d359dce7de57abc71dddce516b09f207fa199a0bf6e41261044b6f14abb6782d60199ab8762eecf92779293e051
diff --git a/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild b/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild
deleted file mode 100644
index 992aac341146..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild,v 1.12 2014/11/25 13:02:17 mrueg Exp $
-
-EAPI=2
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="http://parsetree.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Restrict tests because the test case does not load the right version
-# of sexp_processor.
-RESTRICT="test"
-
-# The sexp-processor dependency is needed to make tests pass for ruby 1.9.
-ruby_add_rdepend ">=dev-ruby/sexp_processor-3.0.9"
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
-ruby_add_bdepend "test? ( >=dev-ruby/sexp_processor-3.0.6 )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	sed -i -e '/perforce/d' Rakefile || die
-
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
diff --git a/dev-tex/bibtex2html/bibtex2html-1.98.ebuild b/dev-tex/bibtex2html/bibtex2html-1.98.ebuild
index 79fe90686955..6d0b3e849bf9 100644
--- a/dev-tex/bibtex2html/bibtex2html-1.98.ebuild
+++ b/dev-tex/bibtex2html/bibtex2html-1.98.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/bibtex2html-1.98.ebuild,v 1.1 2014/10/27 08:28:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/bibtex2html-1.98.ebuild,v 1.2 2015/02/19 09:06:27 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.lri.fr/~filliatr/bibtex2html/"
 SLOT="0"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 RESTRICT="test"
 
 # With use doc we need a latex compiler to generate manual.pdf
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 585b3d0d4f04..cb781c8003ec 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -3,3 +3,4 @@ DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb88
 DIST boost_1_54_0.tar.bz2 57873778 SHA256 047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d SHA512 3467a2bb9b4797cadfc52150cb036939ef35263f421870897dbe9492d1504a714805668a193b0811fdaf39a3527ee693ff70da5b942d7ab11b307e2e693e1760 WHIRLPOOL dbe3cbecaccf86ca184cf73cff75c17d6307b680bab098e38a9efd24d17776481e597017fc9f8fc8f488495f315c6d2b14b9212c51cf98529c302482bf67e92a
 DIST boost_1_55_0.tar.bz2 58146647 SHA256 fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 SHA512 dc606477f4c303e8f40de2586c16394b6d758e198b35bf3a7d3e576a2f49171aadc4f95e8d685fa731bc4e61e19869d5a24e1e816febfca9de078d66e096e041 WHIRLPOOL 6ae111d6a956651bd91914432b743faffeb466703191b05193db47f02fd3528a14ce200f26c1ab77bf2c68994eb5b135b0176f66a746964d334b4793ba113ad5
 DIST boost_1_56_0.tar.bz2 94777674 SHA256 134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d SHA512 1ce9871c3a2519682538a5f1331938b948123432d99aea0ce026958cbebd25d84019a3a28c452724b9693df98a8d1264bb2d93d2fee508453f8b42836e67481e WHIRLPOOL e9e9bb965816b687141d55bc026e378a56ed577a2bf0bdad61a1736e7f11d1797e0cac0185a1fa25b6c4b9fe1f75cbb0bb73a5ea05e84d59385bb3b17a90fd12
+DIST boost_1_57_0.tar.bz2 60821561 SHA256 910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967 SHA512 61881440fd89644c43c6e3bc6292e9fed75a6d3a76f98654b189d0ed4e1087d77b585884e882270c08bf9f7132b173bfc1fde05848e06aa78ba7f1008d10714d WHIRLPOOL ff092af332434082a774645a5eb42829cdbdac805ef86dccce8988542062901524bd4d5fc890e3a9c01f0a721047501e5d8b13d50ffa5368066c3438dcf719d6
diff --git a/dev-util/boost-build/boost-build-1.57.0.ebuild b/dev-util/boost-build/boost-build-1.57.0.ebuild
new file mode 100644
index 000000000000..3ef0289f194e
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.57.0.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.57.0.ebuild,v 1.1 2015/02/18 19:29:52 pinkbyte Exp $
+
+EAPI="5"
+
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV="$(replace_all_version_separators _)"
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils
+		${PYTHON_DEPS} )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
+
+	pushd ../ &>/dev/null || die
+	epatch "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
+	popd &>/dev/null || die
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine" || die
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}" || die
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${EPYTHON#python}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine || die
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc ../notes/{changes,hacking,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		dodoc -r ../example
+		docompress -x "/usr/share/doc/${PF}/example"
+	fi
+}
+
+src_test() {
+	cd ../test || die
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
diff --git a/dev-util/debhelper/debhelper-9.20150101.ebuild b/dev-util/debhelper/debhelper-9.20150101.ebuild
index 01d1570bcf64..273204f714c6 100644
--- a/dev-util/debhelper/debhelper-9.20150101.ebuild
+++ b/dev-util/debhelper/debhelper-9.20150101.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20150101.ebuild,v 1.3 2015/02/13 21:13:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20150101.ebuild,v 1.4 2015/02/19 09:08:40 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test"
 DH_LINGUAS=( de es fr )
 IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
diff --git a/dev-util/debootstrap/debootstrap-1.0.67.ebuild b/dev-util/debootstrap/debootstrap-1.0.67.ebuild
index 656b9bf0e866..50815b0db001 100644
--- a/dev-util/debootstrap/debootstrap-1.0.67.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.67.ebuild,v 1.2 2015/02/13 21:19:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.67.ebuild,v 1.3 2015/02/19 09:08:35 ago Exp $
 
 EAPI=5
 inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 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"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
new file mode 100644
index 000000000000..04ee379ddca5
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild,v 1.1 2015/02/19 07:22:26 jlec Exp $
+
+EAPI=5
+
+inherit check-reqs cuda unpacker versionator
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
+SRC_URI="
+	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
+	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-4.9[cxx]
+	>=x11-drivers/nvidia-drivers-343.22[uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )
+	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
+	"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="1500M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+
+	if use x86; then
+		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
+		ewarn "the support for 32bit linux."
+		ewarn "Be aware that bugfixes and new features may not be available."
+		ewarn "http://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
+	fi
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.8"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+}
+
+src_install() {
+	local i j
+	local remove="doc jre run_files install-linux.pl "
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}"${cudadir}
+
+	# dodoc doc/*txt
+	if use doc; then
+		dodoc doc/pdf/*
+		dohtml -r doc/html/*
+	fi
+
+	if use amd64; then
+		mv doc/man/man3/{,cuda-}deprecated.3 || die
+		doman doc/man/man*/*
+	fi
+
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+	( use profiler || use eclipse ) || remove+=" libnsight"
+	use amd64 || remove+=" cuda-installer.pl"
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for j in nvvp nsight; do
+			cat > bin/${j} <<- EOF
+				#!${EPREFIX}/bin/sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${j}
+		done
+	else
+		use eclipse || remove+=" libnvvp"
+		remove+=" extras/CUPTI"
+	fi
+
+	for i in ${remove}; do
+	ebegin "Cleaning ${i}..."
+		if [[ -e ${i} ]]; then
+			find ${i} -delete || die
+			eend
+		else
+			eend $1
+		fi
+	done
+
+	ln -sf lib lib32 || die
+
+	dodir ${cudadir}
+	mv * "${ED}"${cudadir} || die
+
+	cat > "${T}"/99cuda <<- EOF
+		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(version_sort $(cuda-config -s))"; a=( $a )
+	# greatest supported version
+	b=${a[${#a[@]}-1]}
+
+	# if gcc and if not gcc-version is at least greatesst supported
+	if [[ $(tc-getCC) == *gcc* ]] && \
+		! version_is_at_least $(gcc-version) ${b}; then
+			echo
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			echo
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/games-action/atanks/atanks-6.1.ebuild b/games-action/atanks/atanks-6.1.ebuild
index aef3691aadda..59e73d57be91 100644
--- a/games-action/atanks/atanks-6.1.ebuild
+++ b/games-action/atanks/atanks-6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-6.1.ebuild,v 1.1 2015/01/14 06:08:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-6.1.ebuild,v 1.2 2015/02/19 09:04:08 ago Exp $
 
 EAPI=5
 inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="media-libs/allegro:0[X]"
diff --git a/games-action/awesomenauts/awesomenauts-2013.5.21.3.ebuild b/games-action/awesomenauts/awesomenauts-2013.5.21.3.ebuild
index 1f4cba782da7..0017669d8b13 100644
--- a/games-action/awesomenauts/awesomenauts-2013.5.21.3.ebuild
+++ b/games-action/awesomenauts/awesomenauts-2013.5.21.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/awesomenauts/awesomenauts-2013.5.21.3.ebuild,v 1.3 2014/06/25 13:46:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/awesomenauts/awesomenauts-2013.5.21.3.ebuild,v 1.4 2015/02/19 09:06:02 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="Awesomenauts-Linux-${PV//./-}.bin"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
 
diff --git a/games-action/intrusion2/intrusion2-1.024.ebuild b/games-action/intrusion2/intrusion2-1.024.ebuild
index 99cba51994b2..6259f7cac04e 100644
--- a/games-action/intrusion2/intrusion2-1.024.ebuild
+++ b/games-action/intrusion2/intrusion2-1.024.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/intrusion2/intrusion2-1.024.ebuild,v 1.3 2014/06/25 13:46:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/intrusion2/intrusion2-1.024.ebuild,v 1.4 2015/02/19 09:05:13 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="intrusion2-${USELESS_ID}-bin"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch"
 
diff --git a/games-action/lugaru-demo/Manifest b/games-action/lugaru-demo/Manifest
index ae113d14be9f..fe704640c687 100644
--- a/games-action/lugaru-demo/Manifest
+++ b/games-action/lugaru-demo/Manifest
@@ -1,2 +1 @@
-DIST lugaru-linux-x86-1.0b.bin 26542053 SHA256 053feea569ae203a54e1d1fd95ffcb28db7758d41827fdc41bc1898c92b33085 SHA512 279aa207bdf2f386722acfd9ce37bd3d336734810c626b59678b1bbec90c66cb2dba53820769468d10141a7eb5ce21a165b458ab711c6cb1ab7d7be99c8fa2a8 WHIRLPOOL 1af562495036f9bdac44d238c045b2f33c06326db12c6ed5d4bba1ed07e65e97e323f6498b63c76dd8f58afd66fba977f7156aa1bd230b3d034ff89ce4295e01
 DIST lugaru-linux-x86-1.0c.bin 35539193 SHA256 ad330c9f5496a1fc54fb3640723420a80dfee9da47a71ef7a34a38848c885ade SHA512 fda5287b3836f0f81f391b93aee991ac003bc6e4adbb4d064c05853fd3d348bb71d4e4d1f078dcf149b76e507b26f051205446d5d26e10159e83b59231e756f5 WHIRLPOOL 5a2b8422bd572ba88c47872f642c57d5469c5484172456a103e05e51421eef5e12f6173a6353c4bd816bb4e68b1a4c6a319d135b4e4068251bbf7c7a70b98107
diff --git a/games-action/lugaru-demo/lugaru-demo-1.0b.ebuild b/games-action/lugaru-demo/lugaru-demo-1.0b.ebuild
deleted file mode 100644
index 1572d6d70417..000000000000
--- a/games-action/lugaru-demo/lugaru-demo-1.0b.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/lugaru-demo/lugaru-demo-1.0b.ebuild,v 1.4 2014/04/26 18:09:38 ulm Exp $
-
-inherit eutils games
-
-DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters"
-HOMEPAGE="http://www.wolfire.com/lugaru"
-SRC_URI="http://cdn.wolfire.com/games/lugaru-linux-x86-${PV}.bin"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)"
-
-S=${WORKDIR}/data
-
-src_unpack() {
-	tail -c +193061 "${DISTDIR}"/${A} > ${A}.zip
-	unpack ./${A}.zip
-	rm -f ${A}.zip
-
-	# Duplicate file and can't be handled by portage, bug #14983
-	rm -f "${S}/Data/Textures/Quit.png "
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/lugaru
-
-	insinto "${dir}"
-	doins -r Data *.png *.txt || die "doins failed"
-
-	exeinto "${dir}"
-	doexe lugaru lib*so* xdg-open || die "doexe failed"
-	games_make_wrapper lugaru ./lugaru "${dir}" "${dir}"
-
-	doicon lugaru.png
-	make_desktop_entry lugaru Lugaru lugaru
-
-	prepgamesdirs
-}
diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest
index 3973c34ea7b9..21eb4c31f9f6 100644
--- a/games-action/openclonk/Manifest
+++ b/games-action/openclonk/Manifest
@@ -1,3 +1,2 @@
-DIST openclonk-5.3.3.tar.xz 46516448 SHA256 e6352a695ccb1f7905b2e3014b229e25a9660e82f2a96696521862efaa163abe SHA512 2351b2ec8d3931a05c7f8a4c7ca9ef0285535b1a15da0b02de9046139806211ed64fe3b08a56c3d1712aad07e0a6eea0074ff47d9dbaa874605a788f4c3ab100 WHIRLPOOL 6cc87894b2ab03de35c42fcd3e617f82b66ac06ccdb2ad167a67a0d14ad22fecc048d2d3f2504a5c96efe94103830bcf2f0deaa7a535bea66fb115f12aab4e82
 DIST openclonk-5.5.1-src.tar.bz2 65383438 SHA256 c038d6dc2ef9a3d7966b18ba6147b9dd136f353dfaa5796455f9917b79255743 SHA512 eb111a1f19e2373e6999850dddafa9a5653694904f470690ef39300e4cc3105f0394637e7dbea0a4cff9d91dd30b04f9037252eb0e8830966696f01f6424b977 WHIRLPOOL 990e90ff0daf9aa9dc4826ff621f0647089a68b5ba7d798a4d6cd5ef5d9ec78a666ae897241a6d556f90110f6739206fb09ebc2bc6c9558df65ee67dba0ea8af
 DIST openclonk.png 8487 SHA256 93ff9f479e166f30f1c1042c32624b7e54b4d917813a4f46cce57e39a1f30233 SHA512 3bd2bb20167349130d767719f6732d9682ec32a09f5e8c13fe6245648185eee28edfe564ae64bdc5539c19de701f321887c7fa71e8d1f1f640e0ec6b933544de WHIRLPOOL 190876380614e82092a0d825612cec9dbd0294aec1caf9fe00a137d75525736d87e56507851f61292b736601c1124aac1d1724e94cd0846fa60f5fcab714ef13
diff --git a/games-action/openclonk/files/openclonk-5.3.3-jpeg9.patch b/games-action/openclonk/files/openclonk-5.3.3-jpeg9.patch
deleted file mode 100644
index 7d0de49892eb..000000000000
--- a/games-action/openclonk/files/openclonk-5.3.3-jpeg9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/graphics/C4SurfaceLoaders.cpp.old	2015-01-02 17:31:30.976182860 +0100
-+++ src/graphics/C4SurfaceLoaders.cpp	2015-01-02 17:31:56.488698202 +0100
-@@ -306,7 +306,7 @@
- 	// The doc says to give fake end-of-inputs if there is no more data
- 	cinfo->src->next_input_byte = &end_of_input;
- 	cinfo->src->bytes_in_buffer = 1;
--	return true;
-+	return (boolean)true;
- }
- static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
- {
-@@ -357,7 +357,7 @@
- 	blub.term_source = jpeg_noop;
- 
- 	// a missing image is an error
--	jpeg_read_header(&cinfo, true);
-+	jpeg_read_header(&cinfo, (boolean)true);
- 
- 	// Let libjpeg convert for us
- 	cinfo.out_color_space = JCS_RGB;
diff --git a/games-action/openclonk/files/openclonk-5.3.3-xrandr-primary-output.patch b/games-action/openclonk/files/openclonk-5.3.3-xrandr-primary-output.patch
deleted file mode 100644
index 55fb423bb498..000000000000
--- a/games-action/openclonk/files/openclonk-5.3.3-xrandr-primary-output.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: fix XRandr use
-Author: Guillem Jover <guillem@debian.org>
-
---- a/src/platform/C4AppGTK.cpp
-+++ b/src/platform/C4AppGTK.cpp
-@@ -212,20 +212,25 @@ static XRROutputInfo* GetXRROutputInfoFo
- 	XRRScreenResources * r = XRRGetScreenResources(dpy, w);
- 	if (!r) return NULL;
- 
--	XRROutputInfo * info = XRRGetOutputInfo(dpy, r, XRRGetOutputPrimary(dpy, w));
--	if (!info)
-+	XRROutputInfo * info;
-+	RROutput primary = XRRGetOutputPrimary(dpy, w);
-+	if (primary == None)
-+		info = NULL;
-+	else
- 	{
--		XRRFreeScreenResources(r);
--		return NULL;
-+		info = XRRGetOutputInfo(dpy, r, primary);
-+		if (info->connection == RR_Disconnected || info->crtc == 0)
-+		{
-+			XRRFreeOutputInfo(info);
-+			info = NULL;
-+		}
- 	}
- 
--	if(info->connection == RR_Disconnected || info->crtc == 0)
-+	if (info == NULL)
- 	{
- 		// The default "primary" output does not seem to be connected
- 		// to a piece of actual hardware. As a fallback, go through
- 		// all outputs and choose the first active one.
--		XRRFreeOutputInfo(info);
--		info = NULL;
- 		for(int i = 0; i < r->noutput; ++i)
- 		{
- 			info = XRRGetOutputInfo(dpy, r, r->outputs[i]);
diff --git a/games-action/openclonk/openclonk-5.3.3-r1.ebuild b/games-action/openclonk/openclonk-5.3.3-r1.ebuild
deleted file mode 100644
index a3c424a61a0c..000000000000
--- a/games-action/openclonk/openclonk-5.3.3-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.3.3-r1.ebuild,v 1.5 2015/01/02 17:19:01 tupone Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit autotools eutils flag-o-matic gnome2-utils python-any-r1 toolchain-funcs games
-
-MY_P=${PN}-release-${PV}-src
-
-DESCRIPTION="A free multiplayer action game where you control clonks"
-HOMEPAGE="http://openclonk.org/"
-SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
-	http://${PN}.org/homepage/icon.png -> ${PN}.png"
-
-LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated doc mp3 sound upnp"
-
-RDEPEND="
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/jpeg
-	!dedicated? (
-		media-libs/freetype:2
-		media-libs/glew
-		media-libs/libsdl[X,opengl,video]
-		virtual/opengl
-		virtual/glu
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/libXrandr
-		x11-libs/libX11
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[mp3?,vorbis,wav]
-		)
-	)
-	dedicated? ( sys-libs/readline:0 )
-	upnp? ( net-libs/libupnp )"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.40
-	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		dev-libs/libxml2[python]
-		sys-devel/gettext
-		)"
-
-pkg_setup() {
-	games_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# remove license files
-	sed \
-		-e '/dist_doc_DATA/s#planet/COPYING ##' \
-		-e '/dist_doc_DATA/s#licenses/LGPL.txt ##' \
-		-i Makefile.am || die
-
-	epatch "${FILESDIR}"/${P}-xrandr-primary-output.patch \
-		"${FILESDIR}"/${P}-jpeg9.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable dedicated console) \
-		$(use_enable sound) \
-		$(use_enable mp3) \
-		$(usex dedicated "--with-gtk=no" "--with-gtk=3.0") \
-		$(use_with upnp) \
-		--without-openal \
-		--disable-autoupdate
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-
-	if use doc ; then
-		emake -C docs
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use dedicated; then
-		newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN}
-		doicon -s 64 "${DISTDIR}"/${PN}.png
-		make_desktop_entry ${PN}
-	fi
-	use doc && dohtml -r docs/online/*
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
index e6dd07250cfb..3191ca4bef33 100644
--- a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
+++ b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v 1.6 2014/06/25 13:46:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v 1.7 2015/02/19 10:40:22 ago Exp $
 
 # TODO: unbundle liblua-5.1 when available for multilib
 
@@ -14,7 +14,7 @@ SRC_URI="${PN}_${PV}.tar.gz"
 
 LICENSE="CAPYBARA-EULA LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-action/trine2/trine2-1.16.ebuild b/games-action/trine2/trine2-1.16.ebuild
index 19cf3ab73ca2..af5fcfec65ca 100644
--- a/games-action/trine2/trine2-1.16.ebuild
+++ b/games-action/trine2/trine2-1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/trine2/trine2-1.16.ebuild,v 1.8 2014/06/25 13:46:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/trine2/trine2-1.16.ebuild,v 1.9 2015/02/19 09:05:42 ago Exp $
 
 EAPI=5
 inherit eutils unpacker gnome2-utils games
@@ -12,7 +12,7 @@ SRC_URI="${PN}_linux_installer.run"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="bundled-libs +launcher"
 RESTRICT="fetch bindist splitdebug"
 
diff --git a/games-action/xpilot/xpilot-4.5.5.ebuild b/games-action/xpilot/xpilot-4.5.5.ebuild
index f6a4edc4a528..53f75e0d27b8 100644
--- a/games-action/xpilot/xpilot-4.5.5.ebuild
+++ b/games-action/xpilot/xpilot-4.5.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot/xpilot-4.5.5.ebuild,v 1.4 2015/01/02 11:54:54 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot/xpilot-4.5.5.ebuild,v 1.5 2015/02/19 00:46:13 mr_bones_ Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="A multi-player 2D client/server space game"
@@ -28,12 +28,15 @@ src_prepare() {
 		-e '/^INSTMAN/s:=.*:=/usr/share/man/man6:' \
 		-e "/^INSTLIB/s:=.*:=${GAMES_DATADIR}/${PN}:" \
 		-e "/^INSTBIN/s:=.*:=${GAMES_BINDIR}:" \
-		Local.config \
-		|| die "sed failed"
+		Local.config || die
+	# work with glibc-2.20
+	sed -i \
+		-e 's/getline/lgetline/' \
+		src/client/textinterface.c || die
 }
 
 src_compile() {
-	xmkmf || die "xmkmf failed"
+	xmkmf || die
 	emake Makefiles
 	emake includes
 	emake depend
diff --git a/games-arcade/bub-n-bros/Manifest b/games-arcade/bub-n-bros/Manifest
index 3bc3cd380029..69c73305b4d1 100644
--- a/games-arcade/bub-n-bros/Manifest
+++ b/games-arcade/bub-n-bros/Manifest
@@ -1,2 +1 @@
 DIST bubbros-1.6.2.tar.gz 11568771 SHA256 0ad8a359c4632071a9c85c2684bae32aa0fa278632c49f092dc4078cfb9858c4 SHA512 a05fca8e31655e4bade60cd085f29796d789b349f005c715bf0e37e51f0bacb9d8b9650f3b10470917ee25421d32443e01132816a2f508e359302aa2c6d18ddb WHIRLPOOL 6ed0f68cab694399aef4c75ab0633c9c355cbc5328c72fffacd20612c6cf0cc67b06db65dc808307bd036caba19f1d7e35fedd6c756104e9c1c5ce1054b8a43f
-DIST bubbros-1.6.tar.bz2 9052959 SHA256 dd197e60a23e09800010f3a5906feb77847e6eeaa7cfd47d803a85daa0bcf255 SHA512 6f798363d0b4e6cb8f15b2d3e09f30ed34e9a5066a7dc1b96dfc4f413f07f2d042cdc8c6bd8a721df1bc1f677c11790461047fbf8ddd63d889c8c71f61b0711e WHIRLPOOL a0ca4fdddbbdbab80ac63bf8d92e2396350e59b507a2dd78a797c2c732e6bddc9a911e96a307a6698c45ce01254f136be77ddfc92cb165662dd5fb7d5b02f47c
diff --git a/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild b/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild
deleted file mode 100644
index ee82cd1ed147..000000000000
--- a/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild,v 1.7 2010/09/09 17:35:20 mr_bones_ Exp $
-
-EAPI=2
-PYTHON_DEPEND="2"
-inherit eutils python games
-
-MY_P=${P/-n-}
-DESCRIPTION="A multiplayer clone of the famous Bubble Bobble game"
-HOMEPAGE="http://bub-n-bros.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-python/pygame"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-	games_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-	epatch \
-		"${FILESDIR}"/${P}-home.patch \
-		"${FILESDIR}"/${P}-python25.patch
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() {
-	# Compile the "statesaver" extension module to enable the Clock bonus
-	cd "${S}"/bubbob
-	$(PYTHON) setup.py build_ext -i || die
-
-	# Compile the extension module required for the X Window client
-	cd "${S}"/display
-	$(PYTHON) setup.py build_ext -i || die
-
-	# Build images
-	cd "${S}"/bubbob/images
-	$(PYTHON) buildcolors.py || die
-}
-
-src_install() {
-	local dir=$(games_get_libdir)/${PN}
-
-	exeinto "${dir}"
-	doexe *.py || die "doexe failed"
-
-	insinto "${dir}"
-	doins -r bubbob common display java http2 metaserver || die "doins failed"
-
-	dodir "${GAMES_BINDIR}"
-	dosym "${dir}"/BubBob.py "${GAMES_BINDIR}"/bubnbros || die "dosym failed"
-
-	newicon http2/data/bob.png ${PN}.png
-	make_desktop_entry bubnbros Bub-n-Bros
-
-	prepgamesdirs
-}
diff --git a/games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch b/games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch
deleted file mode 100644
index 4d2cc317aba3..000000000000
--- a/games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- bubbob/images.py	2007-09-08 17:03:41.000000000 +0200
-+++ bubbob/images.py	2007-09-08 17:57:45.000000000 +0200
-@@ -454,7 +454,6 @@
-     # check and maybe regenerate the colored image files
-     file = os.path.join('images', 'buildcolors.py')
-     g = {'__name__': '__auto__', '__file__': file}
--    execfile(file, g)
-     # replace the entries 'filename_%d.ppm' by a family of entries,
-     # one for each color
-     sprmap = {}
---- display/pclient.py	2007-09-08 17:03:41.000000000 +0200
-+++ display/pclient.py	2007-09-08 17:57:45.000000000 +0200
-@@ -162,8 +162,8 @@
-         if mode[-1].has_key('cfgfile'):
-             self.trackcfgfile = mode[-1]['cfgfile']
-         else:
--            self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,
--                                             'http2', 'config.txt')
-+            self.trackcfgfile = os.path.join(os.environ.get('HOME'),
-+                                             '.bubnbros')
-         self.udpsock = None
-         self.udpsock_low = None
-         self.udpsock2 = None
---- http2/httppages.py	2007-09-08 17:03:41.000000000 +0200
-+++ http2/httppages.py	2007-09-08 17:57:45.000000000 +0200
-@@ -38,7 +38,7 @@
- 
- 
- class PageServer:
--    CONFIGFILE = 'config.txt'
-+    CONFIGFILE = '.bubnbros'
-     localservers = None
- 
-     def __init__(self, Game):
-@@ -46,7 +46,7 @@
-         self.seed = hex(random.randrange(0x1000, 0x10000))
-         #self.unique_actions = {}
-         self.localhost = gamesrv.HOSTNAME
--        self.filename = os.path.join(LOCALDIR, self.CONFIGFILE)
-+        self.filename = os.path.join(os.environ.get('HOME'), self.CONFIGFILE)
-         data = self.loadoptionfile()
-         self.globaloptions = Options(data.get('*', {}))
-         self.localoptions  = Options(data.get(self.localhost, {}))
-@@ -333,7 +333,6 @@
-                             'buildcolors.py')
-         if os.path.exists(file):
-             g = {'__name__': '__auto__', '__file__': file}
--            execfile(file, g)
- 
-         if port:
-             address = '%s:%s' % (host, port)
diff --git a/games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch b/games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch
deleted file mode 100644
index d681f31ae850..000000000000
--- a/games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur bubbros-1.5.orig/bubbob/statesaver.c bubbros-1.5/bubbob/statesaver.c
---- bubbros-1.5.orig/bubbob/statesaver.c	2007-09-08 17:43:14.000000000 +0200
-+++ bubbros-1.5/bubbob/statesaver.c	2007-09-08 17:43:14.000000000 +0200
-@@ -75,7 +75,7 @@
-     Py_INCREF(g);  /* exhausted -- can return 'g' itself */
-     return g;
-   }
--  if (f->f_nfreevars || f->f_ncells) {
-+  if (PySequence_Length(co->co_freevars) || PySequence_Length(co->co_cellvars)) {
-     PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
-     goto error;
-   }
-@@ -112,6 +112,8 @@
-   PyFrameObject* f = NULL;
-   PyFrameObject* f2 = NULL;
-   PyCodeObject* co;
-+  PyCodeObject* code;
-+  PyCodeObject* code2;
-   int i, res;
- 
-   if (g != g2)
-@@ -141,9 +143,9 @@
-         Py_DECREF(x);
-         goto error;
-       }
--      f2 = (PyFrameObject*) x;
- 
--      if (f2->f_stacksize != f->f_stacksize) {
-+      code2 = (PyFrameObject*) x;
-+      if (code2->co_stacksize != code->co_stacksize) {
-         PyErr_SetString(PyExc_TypeError, "stack size mismatch");
-         goto error;
-       }
diff --git a/games-arcade/cosmosmash/Manifest b/games-arcade/cosmosmash/Manifest
index 67888b786db5..bce3b2a91b03 100644
--- a/games-arcade/cosmosmash/Manifest
+++ b/games-arcade/cosmosmash/Manifest
@@ -1,2 +1 @@
-DIST cosmosmash-1.4.6.tar.gz 905594 SHA256 6e78b2b3dc5ead19af3e59adeea0ed8e26ebdb2b3f32efdb71b2b16154ae42dd SHA512 5983ce08ac09e8065bb4b31c93fe77e3ac02aa62c7353ea0e0e3191711892757068f8b00f2ac1e8e65c1c41024a79886d71e5926e21182ccd22fff354664aaf2 WHIRLPOOL 02933a8405fd5744a478af4228cf5d48525b7819c8a3e95c8a462ab3c2f17fe6acbe53a1f7491e571764d225f750b319f123bc133cf3674bb50c40226a5eca44
 DIST cosmosmash-1.4.7.tar.gz 906213 SHA256 3f0af3355e31fef9413d3c318f02b64ad6c427f0048d6e15868e51a5ac22b14b SHA512 1eaf8b05550c6f96e6392f6ba4565700cd4a9cac66dd57d634569caf9b4dfaf4917b3b9973153d4e6e0ddcd65c68d5242faae7c4f516c07c2e07d1b2f3b838b9 WHIRLPOOL 7234288c3e6a90b5625e203c221e7c662ac6ef7968134c6c1f963d6405812bfbef986179db93c1914010406e1f02312f3059a9722214324f41a2ddbd33c2b668
diff --git a/games-arcade/cosmosmash/cosmosmash-1.4.6.ebuild b/games-arcade/cosmosmash/cosmosmash-1.4.6.ebuild
deleted file mode 100644
index 9d1778ef287c..000000000000
--- a/games-arcade/cosmosmash/cosmosmash-1.4.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/cosmosmash/cosmosmash-1.4.6.ebuild,v 1.5 2015/01/04 14:43:09 tupone Exp $
-
-EAPI=5
-inherit autotools games
-
-DESCRIPTION="A space rock shooting video game"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/cosmosmash.html"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="test" # uses the sound card which portage user might not be available.
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am \
-		|| die
-	eautoreconf
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-	doman doc/${PN}.6
-	dodoc AUTHORS NEWS README THANKS
-	prepgamesdirs
-}
diff --git a/games-arcade/funnyboat/funnyboat-1.5.ebuild b/games-arcade/funnyboat/funnyboat-1.5.ebuild
deleted file mode 100644
index c042da1f5ffb..000000000000
--- a/games-arcade/funnyboat/funnyboat-1.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/funnyboat/funnyboat-1.5.ebuild,v 1.6 2013/06/08 19:17:58 slyfox Exp $
-
-inherit eutils games
-
-DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
-HOMEPAGE="http://funnyboat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-python/pygame-1.6.2
-	=dev-lang/python-2*"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data *.py || die "doins failed"
-	dodoc *.txt
-	# does not like python3 (fails on os.environ["HOME"])
-	games_make_wrapper ${PN} "python2 main.py" "${GAMES_DATADIR}"/${PN}
-	newicon data/kuvake.png ${PN}.png
-	make_desktop_entry ${PN} "Trip on the Funny Boat"
-	prepgamesdirs
-}
diff --git a/games-arcade/gish-demo/gish-demo-1.6.ebuild b/games-arcade/gish-demo/gish-demo-1.6.ebuild
index ad008e40fe3c..1e032c619159 100644
--- a/games-arcade/gish-demo/gish-demo-1.6.ebuild
+++ b/games-arcade/gish-demo/gish-demo-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gish-demo/gish-demo-1.6.ebuild,v 1.1 2014/06/26 18:38:03 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gish-demo/gish-demo-1.6.ebuild,v 1.2 2015/02/19 10:39:56 ago Exp $
 
 EAPI=5
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://s159260531.onlinehome.us/demos/gishdemo.tar.gz -> ${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/gish"
diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r1.ebuild
index ddc0b56f145d..e4da664365bd 100644
--- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild
+++ b/games-arcade/jardinains/jardinains-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/jardinains-2.0-r1.ebuild,v 1.3 2015/02/08 09:38:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/jardinains-2.0-r1.ebuild,v 1.4 2015/02/19 10:41:07 ago Exp $
 
 EAPI=5
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
 
 LICENSE="jardinains"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains"
diff --git a/games-arcade/supertux/supertux-0.1.3.ebuild b/games-arcade/supertux/supertux-0.1.3.ebuild
index 6dc9cc7b976d..06aa366dfbe6 100644
--- a/games-arcade/supertux/supertux-0.1.3.ebuild
+++ b/games-arcade/supertux/supertux-0.1.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/supertux/supertux-0.1.3.ebuild,v 1.19 2014/10/09 04:33:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/supertux/supertux-0.1.3.ebuild,v 1.20 2015/02/19 06:28:27 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils games
 
 DESCRIPTION="A game similar to Super Mario Bros"
 HOMEPAGE="http://super-tux.sourceforge.net"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+SRC_URI="https://supertux.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,17 +18,17 @@ DEPEND="media-libs/libsdl[joystick]
 	media-libs/sdl-image[png,jpeg]
 	media-libs/sdl-mixer[mod,vorbis]
 	x11-libs/libXt"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
 
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-ndebug.patch
+src_prepare() {
+	epatch \
+	"${FILESDIR}"/${P}-gcc41.patch \
+	"${FILESDIR}"/${P}-ndebug.patch \
 	"${FILESDIR}"/${P}-desktop.patch
-)
+}
 
 src_configure() {
 	egamesconf \
-		--disable-dependency-tracking \
 		--disable-debug \
 		$(use_enable opengl)
 }
@@ -37,7 +37,7 @@ src_install() {
 	emake DESTDIR="${D}" \
 		desktopdir=/usr/share/applications \
 		icondir=/usr/share/pixmaps \
-		install || die
+		install
 	dodoc AUTHORS ChangeLog LEVELDESIGN README TODO
 	prepgamesdirs
 }
diff --git a/games-board/domination/domination-1.1.1.5.ebuild b/games-board/domination/domination-1.1.1.5.ebuild
index 93ff6b5d7d50..c0bf84651912 100644
--- a/games-board/domination/domination-1.1.1.5.ebuild
+++ b/games-board/domination/domination-1.1.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/domination/domination-1.1.1.5.ebuild,v 1.5 2014/12/29 17:16:03 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/domination/domination-1.1.1.5.ebuild,v 1.6 2015/02/18 19:34:48 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils java-pkg-2 java-ant-2 games
@@ -32,16 +32,15 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${D}${GAMES_PREFIX}"/bin
-	cp "${S}"/FlashGUI.sh "${D}${GAMES_PREFIX}"/bin/${PN} || die
+	newgamesbin "${S}"/FlashGUI.sh ${PN}
 	sed -i \
 		-e "s|cd.*|cd \"${GAMES_DATADIR}\"/${PN}|" \
-		"${D}${GAMES_PREFIX}"/bin/${PN} \
+		"${D}${GAMES_BINDIR}"/${PN} \
 		|| die
-	chmod +x "${D}${GAMES_PREFIX}"/bin/${PN} || die
+	chmod +x "${D}${GAMES_BINDIR}"/${PN} || die
 
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r "${S}"/* || die
+	doins -r "${S}"/*
 	rm -f "${D}${GAMES_DATADIR}"/${PN}/*.cmd || die
 	java-pkg_regjar "${D}/${GAMES_DATADIR}/${PN}"/*.jar
 
diff --git a/games-board/pokerth/pokerth-1.1.1.ebuild b/games-board/pokerth/pokerth-1.1.1.ebuild
index 45ef38e0db62..1498923698ee 100644
--- a/games-board/pokerth/pokerth-1.1.1.ebuild
+++ b/games-board/pokerth/pokerth-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-1.1.1.ebuild,v 1.5 2014/06/08 11:07:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-1.1.1.ebuild,v 1.6 2015/02/18 19:37:33 mr_bones_ Exp $
 
 EAPI=5
 inherit flag-o-matic eutils qt4-r2 games
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="dedicated"
 
 RDEPEND="dev-db/sqlite:3
-	dev-libs/boost[threads(+)]
+	dev-libs/boost:=[threads(+)]
 	dev-libs/protobuf
 	dev-libs/libgcrypt:0
 	dev-libs/tinyxml[stl]
diff --git a/games-emulation/advancemenu/advancemenu-2.7.ebuild b/games-emulation/advancemenu/advancemenu-2.7.ebuild
index 1eb75b872804..e4083d6adfe5 100644
--- a/games-emulation/advancemenu/advancemenu-2.7.ebuild
+++ b/games-emulation/advancemenu/advancemenu-2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.7.ebuild,v 1.2 2014/07/21 19:15:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.7.ebuild,v 1.3 2015/02/19 10:40:57 ago Exp $
 
 EAPI=5
 inherit autotools eutils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
 
 RDEPEND="dev-libs/expat
diff --git a/games-emulation/daphne/daphne-1.0.ebuild b/games-emulation/daphne/daphne-1.0.ebuild
index 3a6de9df2b20..ff3ea5f64072 100644
--- a/games-emulation/daphne/daphne-1.0.ebuild
+++ b/games-emulation/daphne/daphne-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.8 2015/01/17 14:04:36 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.10 2015/02/19 07:08:21 patrick Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs games
@@ -9,51 +9,47 @@ DESCRIPTION="Laserdisc Arcade Game Emulator"
 HOMEPAGE="http://www.daphne-emu.com/"
 SRC_URI="http://www.daphne-emu.com/download/${P}-src.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/libogg
 	media-libs/libvorbis
-	media-libs/libsdl[video]
+	sys-libs/zlib
+	media-libs/libsdl[joystick,video]
 	media-libs/sdl-mixer
+	media-libs/libmpeg2
+	virtual/opengl
 	media-libs/glew"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/v_1_0/src
 
 src_prepare() {
-	# Fix no sound issue with >=media-libs/libvorbis-1.2.0
-	epatch "${FILESDIR}/${P}"-vorbisfilefix.patch
-
-	# amd64 does not like int pointers
-	epatch "${FILESDIR}/${P}"-typefix.patch
-
-	epatch "${FILESDIR}/${P}"-gcc43.patch \
+	epatch \
+		"${FILESDIR}"/${P}-vorbisfilefix.patch \
+		"${FILESDIR}"/${P}-typefix.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-system-lmpeg2.patch
 
 	sed -i "/m_appdir =/s:\.:${GAMES_DATADIR}/${PN}:" \
-		io/homedir.cpp \
-		|| die "sed homedir.cpp failed"
+		io/homedir.cpp || die
 	sed -i "s:pics/:${GAMES_DATADIR}/${PN}/&:" \
-		video/video.cpp \
-		|| die "sed video.cpp failed"
+		video/video.cpp || die
 	sed -i "s:sound/:${GAMES_DATADIR}/${PN}/&:" \
-		sound/sound.cpp \
-		|| die "sed sound.cpp failed"
+		sound/sound.cpp || die
 	sed -i "s:./lib:$(games_get_libdir)/${PN}/lib:" \
-		io/dll.h \
-		|| die "sed dll.h failed"
+		io/dll.h || die
 
 	sed \
 		-e "s:-DNATIVE_CPU_X86::" \
 		-e "s:-DUSE_MMX::" \
 		-e '/export USE_MMX = 1/s:^:# :' \
-		Makefile.vars.linux_x86 >Makefile.vars \
-		|| die "sed failed"
+		Makefile.vars.linux_x86 >Makefile.vars || die
 }
 
 src_configure() {
@@ -75,8 +71,7 @@ src_compile() {
 	emake \
 		CXX=$(tc-getCXX) \
 		DFLAGS="${CXXFLAGS} ${archflags}"
-	cd vldp2
-	emake \
+	emake -C vldp2 \
 		-f Makefile.linux \
 		CC=$(tc-getCC) \
 		DFLAGS="${CFLAGS} ${archflags}"
diff --git a/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch b/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
new file mode 100644
index 000000000000..7eed630d13f7
--- /dev/null
+++ b/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
@@ -0,0 +1,41 @@
+diff -ur v_1_0.old/src/vldp2/Makefile.am v_1_0/src/vldp2/Makefile.am
+--- v_1_0.old/src/vldp2/Makefile.am	2009-12-29 18:04:15.000000000 +0200
++++ v_1_0/src/vldp2/Makefile.am	2009-12-29 18:10:42.000000000 +0200
+@@ -1,3 +1,3 @@
+-SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
++SUBDIRS = autotools
+ 
+ EXTRA_DIST = bootstrap
+diff -ur v_1_0.old/src/vldp2/Makefile.in v_1_0/src/vldp2/Makefile.in
+--- v_1_0.old/src/vldp2/Makefile.in	2009-12-29 18:04:15.000000000 +0200
++++ v_1_0/src/vldp2/Makefile.in	2009-12-29 18:10:51.000000000 +0200
+@@ -128,7 +128,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
++SUBDIRS = autotools
+ 
+ EXTRA_DIST = bootstrap
+ subdir = .
+diff -ur v_1_0.old/src/vldp2/Makefile.linux v_1_0/src/vldp2/Makefile.linux
+--- v_1_0.old/src/vldp2/Makefile.linux	2009-12-29 18:04:15.000000000 +0200
++++ v_1_0/src/vldp2/Makefile.linux	2009-12-29 18:13:12.000000000 +0200
+@@ -14,14 +14,9 @@
+ DFLAGS = -O3 -march=i686 -fomit-frame-pointer -funroll-loops
+ 
+ CFLAGS = ${DFLAGS} `sdl-config --cflags` -I./include
+-LIBS = `sdl-config --libs`
++LIBS = `sdl-config --libs` -lmpeg2
+ 
+-OBJS =  vldp/vldp.o vldp/vldp_internal.o vldp/mpegscan.o \
+-	libmpeg2/cpu_accel.o libmpeg2/alloc.o libmpeg2/cpu_state.o \
+-	libmpeg2/decode.o libmpeg2/header.o libmpeg2/motion_comp.o	\
+-	libmpeg2/idct.o libmpeg2/idct_mmx.o libmpeg2/motion_comp_mmx.o \
+-		libmpeg2/slice.o	\
+-	libvo/video_out.o libvo/video_out_null.o 
++OBJS =  vldp/vldp.o vldp/vldp_internal.o vldp/mpegscan.o
+ 
+ LIBNAME =	libvldp2.so
+ 
+ 
diff --git a/games-emulation/daphne/files/daphne-1.0-typefix.patch b/games-emulation/daphne/files/daphne-1.0-typefix.patch
index eaa97e46accf..f47511a0cd03 100644
--- a/games-emulation/daphne/files/daphne-1.0-typefix.patch
+++ b/games-emulation/daphne/files/daphne-1.0-typefix.patch
@@ -1,3 +1,5 @@
+amd64 does not like int pointers
+
 diff -ruN v_1_0.orig/src/ldp-in/ldv1000.cpp v_1_0/src/ldp-in/ldv1000.cpp
 --- v_1_0.orig/src/ldp-in/ldv1000.cpp	2008-01-29 18:04:34.000000000 +0100
 +++ v_1_0/src/ldp-in/ldv1000.cpp	2008-09-19 14:29:40.000000000 +0200
diff --git a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
index 715040243314..49eb1aaab62d 100644
--- a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
+++ b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
@@ -1,3 +1,5 @@
+Fix no sound issue with >=media-libs/libvorbis-1.2.0
+
 diff -ruN v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp v_1_0/src/ldp-out/ldp-vldp-audio.cpp
 --- v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp	2008-01-29 18:04:07.000000000 +0100
 +++ v_1_0/src/ldp-out/ldp-vldp-audio.cpp	2008-09-19 13:43:10.000000000 +0200
diff --git a/games-emulation/dboxfe/dboxfe-0.1.3.ebuild b/games-emulation/dboxfe/dboxfe-0.1.3.ebuild
index 7b87aaef2dba..871c4166be66 100644
--- a/games-emulation/dboxfe/dboxfe-0.1.3.ebuild
+++ b/games-emulation/dboxfe/dboxfe-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dboxfe/dboxfe-0.1.3.ebuild,v 1.13 2015/02/18 08:42:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dboxfe/dboxfe-0.1.3.ebuild,v 1.14 2015/02/19 09:03:48 ago Exp $
 
 EAPI=5
 inherit eutils qt4-r2 games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dboxfe.berlios/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4
diff --git a/games-emulation/dgen-sdl/Manifest b/games-emulation/dgen-sdl/Manifest
index 9cfafe8d89d0..cadb1b482eac 100644
--- a/games-emulation/dgen-sdl/Manifest
+++ b/games-emulation/dgen-sdl/Manifest
@@ -1,3 +1,2 @@
 DIST dgen-sdl-1.30.tar.gz 608549 SHA256 2ecd364ff64d4ba759b7159d73e1bb8f289f6d5a4b7dfa021d4ab5cbc6443b86 SHA512 bb112c885d54a01082e2585837aba4f084012e86d5244c483f77d091572b6dda7c98769c47ac93cf92e59ad4731af0516a45dd92270fb23aefa0c91c12942f40 WHIRLPOOL 15abacb96d6ccbf9506bb61a51597d7e057baeeccc5b75df3f1167a612b46bc2b7fa8d64b64ef07f9e8043af6eb2906d391a6e2d2a7fb5691c9a6c0e3146a061
-DIST dgen-sdl-1.32.tar.gz 885601 SHA256 23f8344f3f4717584bd0bcbc7d374e7c9ac40f155be9fac36544d82c7d603c30 SHA512 5848572f2e92d554af11e6e5ab5be281be11fff552795be691455ebb0e5aea445ce69eec20a499e4364f16233860a20447f4804f037ee1a41e817a670da3aa38 WHIRLPOOL 6b9a062c6ad9c6458cba8d9fdff281e975b1343bb8d5f3e01e35548920d853dbedd33653f59c7c51c59ed2798ad0477cf41ef0aaf6a330386860153d017d5fdd
 DIST dgen-sdl-1.33.tar.gz 939297 SHA256 99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e SHA512 c98ab8cdced62a5d26fd677ad36b031e756620114c946ac067599e84ae6ebcfab731554dd4337b6314c3b5db4601c8a6cc67c285d2aad136e659b9973c01a749 WHIRLPOOL 09c22244983ca960b03a25f633e9885698787a57d3a4e5be2e6af571d71a38d166dbf18aac280e8980ec4e7db2f4eaac6927dd529641c3bd1758a9984e64a211
diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.32.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.32.ebuild
deleted file mode 100644
index 6af97722160a..000000000000
--- a/games-emulation/dgen-sdl/dgen-sdl-1.32.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/dgen-sdl-1.32.ebuild,v 1.2 2015/02/13 06:24:43 mr_bones_ Exp $
-
-EAPI=5
-inherit games
-
-DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
-HOMEPAGE="http://dgen.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dgen/files/${P}.tar.gz"
-
-LICENSE="dgen-sdl BSD BSD-2 free-noncomm LGPL-2.1+ GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="joystick opengl"
-
-RDEPEND="media-libs/libsdl[joystick?]
-	app-arch/libarchive
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
-
-src_configure() {
-	egamesconf \
-		$(use_enable x86 asm) \
-		$(use_enable joystick) \
-		$(use_enable opengl)
-}
-
-src_compile() {
-	emake -C musa m68kops.h
-	emake
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README sample.dgenrc" default
-	prepgamesdirs
-}
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index ae4ddc85385b..1db9abeaccb9 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,2 +1 @@
-DIST fceux-2.1.5.src.tar.bz2 7322199 SHA256 ee6b1ee6a0347e325032f6655a5caa289e2b0458f7fccddccd5137f1cd63bf9f SHA512 932cadf848b808334689a7bcf1f1985005d11fbc97ec6b2b94480fc3381e8d654304fab80962299d47b7e52fd32fab0697e8a31dbbf50d8fce52ca870daf7c7b WHIRLPOOL 286e06c9cf269e06d938deb9e5451ee16fab1190d49d3702c45eae95de06212c17d758154c5a928d1b9bb693404e3a8709aa27a94a0ab2f48465f3591bde8c52
 DIST fceux-2.2.2.src.tar.gz 9249858 SHA256 804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1 SHA512 3d3b11c21232656492d962c21a93097f66e33fbd5adbbce6b771dc004393f30502c369eae83c23d988c7e447b4784740a10dfcb0811252854d4364c4b1face98 WHIRLPOOL 61d12dd5db761d31ae83dcfc3117538313910cf844e502457326503d966ac38ca69e7c90d696da991394dd67a0b115f2b0698c217b5a077ed1c3ec9649508ff8
diff --git a/games-emulation/fceux/fceux-2.1.5.ebuild b/games-emulation/fceux/fceux-2.1.5.ebuild
deleted file mode 100644
index 3fa83866cc51..000000000000
--- a/games-emulation/fceux/fceux-2.1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/fceux-2.1.5.ebuild,v 1.4 2012/10/26 07:31:49 tupone Exp $
-
-EAPI=4
-inherit eutils scons-utils games
-
-DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="http://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lua +opengl"
-
-RDEPEND="lua? ( dev-lang/lua )
-	media-libs/libsdl[opengl?,video]
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	sys-libs/zlib
-	gnome-extra/zenity"
-DEPEND="${RDEPEND}"
-
-# Note: zenity is "almost" optional. It is possible to compile and run fceux
-# without zenity, but file dialogs will not work.
-
-S=${WORKDIR}/fceu${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-	# mentioned in bug #335836
-	if ! use lua ; then
-		sed -i -e '/_S9XLUA_H/d' SConstruct || die
-	fi
-}
-
-src_compile() {
-	escons \
-		CREATE_AVI=1 \
-		$(use_scons opengl OPENGL) \
-		$(use_scons lua LUA)
-}
-
-src_install() {
-	dogamesbin bin/fceux
-
-	doman documentation/fceux.6
-	docompress -x /usr/share/doc/${PF}/documentation
-	docompress -x /usr/share/doc/${PF}/fceux.chm
-	dodoc -r Authors.txt changelog.txt TODO-PROJECT bin/fceux.chm documentation
-	rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6"
-
-	prepgamesdirs
-}
diff --git a/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch b/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
deleted file mode 100644
index 8062f946518a..000000000000
--- a/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fceu2.1.5/src/file.cpp
-+++ b/fceu2.1.5/src/file.cpp
-@@ -310,7 +310,7 @@
- 				if(magic==0x088b1f) {
- 					 // maybe gzip... 
- 
--					void* gzfile = gzopen(fileToOpen.c_str(),"rb");
-+					gzFile gzfile = gzopen(fileToOpen.c_str(),"rb");
- 					if(gzfile) {
- 						delete fp;
- 
diff --git a/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch b/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
deleted file mode 100644
index de32c5f35b73..000000000000
--- a/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/utils/endian.h.old
-+++ src/utils/endian.h
-@@ -93,19 +93,6 @@
- 	}
- }
- 
--template<typename T>
--int writele(T *Bufo, EMUFILE*os)
--{
--	CTASSERT(sizeof(T)==1||sizeof(T)==2||sizeof(T)==4||sizeof(T)==8);
--	switch(sizeof(T)) {
--		case 1: return write8le((uint8*)Bufo,os);
--		case 2: return write16le((uint16*)Bufo,os);
--		case 4: return write32le((uint32*)Bufo,os);
--		case 8: return write64le((uint64*)Bufo,os);
--		default:
--			return 0;
--	}
--}
- 
- #endif //__FCEU_ENDIAN
- 
diff --git a/games-emulation/fceux/files/fceux-2.1.5-underlink.patch b/games-emulation/fceux/files/fceux-2.1.5-underlink.patch
deleted file mode 100644
index 9e98967227d4..000000000000
--- a/games-emulation/fceux/files/fceux-2.1.5-underlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- SConstruct.org
-+++ SConstruct
-@@ -70,6 +70,10 @@
-     env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
-     env.Append(CPPDEFINES=["_GTK3"])
-     env.Append(CCFLAGS = ["-D_GTK"])
-+  env.Append(LIBS =["-lz"])
-+  env.Append(LIBS =["-ldl"])
-+  env.Append(LIBS =["-lX11"])
-+
-   ### Lua platform defines
-   ### Applies to all files even though only lua needs it, but should be ok
-   if env['LUA']:
diff --git a/games-emulation/generator/generator-0.35_p4.ebuild b/games-emulation/generator/generator-0.35_p4.ebuild
index 3ae96790728e..f6630f66b287 100644
--- a/games-emulation/generator/generator-0.35_p4.ebuild
+++ b/games-emulation/generator/generator-0.35_p4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35_p4.ebuild,v 1.1 2014/07/02 03:48:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35_p4.ebuild,v 1.2 2015/02/19 09:03:53 ago Exp $
 
 EAPI=5
 inherit autotools eutils toolchain-funcs games
@@ -12,7 +12,7 @@ SRC_URI="http://www.squish.net/generator/cbiere/generator/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+sdlaudio"
 
 DEPEND="virtual/jpeg
diff --git a/games-emulation/gngeo/gngeo-0.8.ebuild b/games-emulation/gngeo/gngeo-0.8.ebuild
index 7cf408342cac..55ecc50adf2c 100644
--- a/games-emulation/gngeo/gngeo-0.8.ebuild
+++ b/games-emulation/gngeo/gngeo-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.8.ebuild,v 1.1 2015/01/24 05:58:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.8.ebuild,v 1.2 2015/02/19 10:41:18 ago Exp $
 
 EAPI=5
 inherit eutils autotools games
@@ -11,7 +11,7 @@ SRC_URI="http://gngeo.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-emulation/hatari/hatari-1.8.0.ebuild b/games-emulation/hatari/hatari-1.8.0.ebuild
index cc977d36e769..915880103be6 100644
--- a/games-emulation/hatari/hatari-1.8.0.ebuild
+++ b/games-emulation/hatari/hatari-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.8.0.ebuild,v 1.2 2015/02/15 23:03:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.8.0.ebuild,v 1.3 2015/02/19 09:06:37 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 7f130ee7a4d6..69de8c5c4db6 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -1,2 +1 @@
-DIST higan_v092-source.tar.xz 790136 SHA256 b73a740c6a8a82fe42a3f166df16806a6fbe8c140c82d7f6089ed984d7491168 SHA512 42cf0ed599ab7cd2da3b52c39cc1402d3af7112999ad1db2c625d9fb2b94631a55526177dcfbdbd1d065c971603fc9b1488bdea0b367a266f1740f263c207dbc WHIRLPOOL a6fdd199ef77dcb1cd7b556ab8fa5e1eefd71eb1c51aae8f58ab7f19c25707ba40836741bb10f4cda6026031e43745f637ce3c39cc4288600c10c749cc13899f
 DIST higan_v094-source.tar.xz 882732 SHA256 5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da WHIRLPOOL 42e2b628e83b6cb8d87ce82c2e91105b0be06790a1927aa7d52f0b1a181af5d627f467009d15daffd470e3c38a2bb7d67ba84919fb1aa9c8d06ad88ca3163641
diff --git a/games-emulation/higan/files/higan-092-QA.patch b/games-emulation/higan/files/higan-092-QA.patch
deleted file mode 100644
index 448bd20a3400..000000000000
--- a/games-emulation/higan/files/higan-092-QA.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun  9 10:23:38 UTC 2013
-Subject: 
-
---- higan_v092-source/higan/Makefile
-+++ higan_v092-source/higan/Makefile
-@@ -16,8 +16,8 @@
- # compiler
- c       := $(compiler) -std=gnu99
- cpp     := $(subst cc,++,$(compiler)) -std=gnu++0x
--flags   := -I. -O3 -fomit-frame-pointer
--link    := -s
-+flags   := -I.
-+link    := $(LDFLAGS)
- objects := libco
- 
- # profile-guided optimization mode
-@@ -33,7 +33,6 @@
- 
- # platform
- ifeq ($(platform),x)
--  flags += -march=native
-   link += -Wl,-export-dynamic -ldl -lX11 -lXext
- else ifeq ($(platform),win)
-   ifeq ($(arch),win32)
-@@ -57,9 +56,9 @@
- compile = \
-   $(strip \
-     $(if $(filter %.c,$<), \
--      $(c) $(flags) $1 -c $< -o $@, \
-+      $(c) $(flags) $(CFLAGS) $1 -c $< -o $@, \
-       $(if $(filter %.cpp,$<), \
--        $(cpp) $(flags) $1 -c $< -o $@ \
-+        $(cpp) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \
-       ) \
-     ) \
-   )
---- higan_v092-source/higan/target-ethos/Makefile
-+++ higan_v092-source/higan/target-ethos/Makefile
-@@ -67,7 +67,7 @@
- # targets
- build: $(objects)
- ifeq ($(platform),x)
--	$(strip $(cpp) -o out/$(name) $(objects) $(link))
-+	$(strip $(cpp) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
- else ifeq ($(platform),win)
- 	$(strip $(cpp) -shared -o out/phoenix.dll obj/phoenix.o $(phoenixlink))
- 	$(strip $(cpp) -o out/$(name) $(subst obj/phoenix.o,,$(objects)) $(link) -Lout -lphoenix)
diff --git a/games-emulation/higan/higan-092.ebuild b/games-emulation/higan/higan-092.ebuild
deleted file mode 100644
index 2aca67dd3f88..000000000000
--- a/games-emulation/higan/higan-092.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/higan/higan-092.ebuild,v 1.3 2013/08/28 11:14:00 ago Exp $
-
-EAPI=5
-
-inherit eutils gnome2-utils toolchain-funcs games
-
-MY_P=${PN}_v${PV}-source
-
-DESCRIPTION="A Nintendo multi-system emulator formerly known as bsnes"
-HOMEPAGE="http://byuu.org/higan/ https://code.google.com/p/higan/"
-SRC_URI="http://higan.googlecode.com/files/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio qt4 +sdl xv"
-REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
-	|| ( xv opengl sdl )
-	|| ( profile_accuracy profile_balanced profile_performance )"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	ao? ( media-libs/libao )
-	openal? ( media-libs/openal )
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-	xv? ( x11-libs/libXv )
-	opengl? ( virtual/opengl )
-	sdl? ( media-libs/libsdl[X,joystick,video] )
-	!qt4? ( x11-libs/gtk+:2 )
-	qt4? ( >=dev-qt/qtgui-4.5:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-disable_module() {
-	sed -i \
-		-e "s|$1\b||" \
-		"${S}"/${PN}/target-ethos/Makefile || die
-}
-
-src_prepare() {
-	local i
-
-	epatch "${FILESDIR}"/${P}-QA.patch
-
-	sed -i \
-		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
-		${PN}/nall/dl.hpp || die "fixing libdir failed!"
-
-	# audio modules
-	use ao || disable_module audio.ao
-	use openal || disable_module audio.openal
-	use pulseaudio ||  { disable_module audio.pulseaudio
-		disable_module audio.pulseaudiosimple ;}
-	use oss || disable_module audio.oss
-	use alsa || disable_module audio.alsa
-
-	# video modules
-	use opengl || disable_module video.glx
-	use xv || disable_module video.xv
-	use sdl || disable_module video.sdl
-
-	# input modules
-	use sdl || disable_module input.sdl
-
-	# regenerate .moc if needed
-	if use qt4; then
-		cd ${PN}/phoenix/qt || die
-		moc -i -I. -o platform.moc platform.moc.hpp || die
-	fi
-
-	for i in profile_accuracy profile_balanced profile_performance ; do
-		if use ${i} ; then
-			cp -dRP "${S}/${PN}" "${S}/${PN}_${i}" || die
-		fi
-	done
-}
-
-src_compile() {
-	local mytoolkit i
-
-	if use qt4; then
-		mytoolkit="qt"
-	else
-		mytoolkit="gtk"
-	fi
-
-	for i in profile_accuracy profile_balanced profile_performance ; do
-		if use ${i} ; then
-			cd "${S}/${PN}_${i}" || die
-			emake \
-				platform="x" \
-				compiler="$(tc-getCXX)" \
-				profile="${i#profile_}" \
-				phoenix="${mytoolkit}"
-
-			sed \
-				-e "s:%GAMES_DATADIR%:${GAMES_DATADIR}:" \
-				< "${FILESDIR}"/${PN}-wrapper \
-				> out/${PN}-wrapper || die "generating wrapper failed!"
-		fi
-	done
-}
-
-src_install() {
-	local i
-
-	for i in profile_accuracy profile_balanced profile_performance ; do
-		if use ${i} ; then
-			# install higan
-			newgamesbin "${S}/${PN}_${i}"/out/${PN} ${PN}-${i#profile_}.bin
-			newgamesbin "${S}/${PN}_${i}"/out/${PN}-wrapper ${PN}-${i#profile_}
-			make_desktop_entry "${PN}-${i#profile_}" "${PN} (${i#profile_})"
-		fi
-	done
-
-	# copy home directory stuff to a global location
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ${PN}/data/cheats.bml ${PN}/profile/*
-
-	# install shaders
-	if use opengl; then
-		insinto "${GAMES_DATADIR}/${PN}/Video Shaders"
-		doins shaders/*OpenGL*.shader
-	fi
-
-	doicon -s 48 ${PN}/data/${PN}.png
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  dev-games/higan-ananke (extra rom load options)"
-	elog "  games-util/higan-purify (Rom purifier)"
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/mamory/mamory-0.2.25.ebuild b/games-emulation/mamory/mamory-0.2.25.ebuild
index b3539fee3c67..7e26d7ac2109 100644
--- a/games-emulation/mamory/mamory-0.2.25.ebuild
+++ b/games-emulation/mamory/mamory-0.2.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mamory/mamory-0.2.25.ebuild,v 1.6 2015/02/18 08:33:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mamory/mamory-0.2.25.ebuild,v 1.7 2015/02/19 09:03:02 ago Exp $
 
 EAPI=5
 inherit autotools games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="dev-libs/expat"
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index 2bc7709d43b6..6d12e025d356 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,3 +1,2 @@
 DIST mednafen-0.9.28-wip.tar.bz2 3901828 SHA256 415ce0055c43560fb8e5b225108cfeb2fb2363841c39cc37eaa1c5e605675bde SHA512 4bc4347e31c7b4ddc10426ff422192706cf90a7fef10209c09880eef5e1b8f3c6820ffb975e68e030e26be0bb5999a299bd2d95cf52b036438c0499edb099033 WHIRLPOOL 458e2157b615f587087fd94a5a77f2d07eda9a5d2248304044178371e71b84069cb55b0d4d27dc92a2517b1bc98779bf675f237e5e428c747ca17c062822207c
-DIST mednafen-0.9.32-wip.tar.bz2 4198850 SHA256 830b5a45360f92e3281c3d3d4e80b39a93424d1b5fc3afbc3dd6a587b09abfb2 SHA512 3e43af412b3d8c97fb15e92a5d3c6f0135dc4d55551c302e8cd07a54b959ff36c29baca3b0b42f0c9c752d956116966ae3e727ce80ce41c805c2f04737677be6 WHIRLPOOL ae00f0658ad6f9e84fd57465778b48052428c99325b35f7a424acce628f5e532a9738fce6c93018fa6d18016ec46342311a9671255c036225b2aef05cd6d5985
 DIST mednafen-0.9.38.1.tar.bz2 3815928 SHA256 52a485f9bebb3145b2e78771b37da4de293cac725d1b7698dc4acc3cf21dfe68 SHA512 7cb0a264c50f0a8f456a193bf1db5ba68dd653fd8f67ec53a996f5c09ee436eeec9b053be949bea21684085b241690921b3f1f7a225a49ac07d740aae0bd5c20 WHIRLPOOL 15c7a3a13ff64011fda5e4155881a8ab2132e3738ede780ba6bb43e82a577bddde56e978a6b3f2a958dd01603c2c541af5a96acf9f4485a25db05575c185a0e3
diff --git a/games-emulation/mednafen/files/mednafen-0.9.32-automake-1.13.patch b/games-emulation/mednafen/files/mednafen-0.9.32-automake-1.13.patch
deleted file mode 100644
index 14c69d94ef0e..000000000000
--- a/games-emulation/mednafen/files/mednafen-0.9.32-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mednafen-0.9.28-wip/mednafen/configure.ac
-+++ mednafen-0.9.28-wip/mednafen/configure.ac
-@@ -13,7 +13,7 @@
- AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE([mednafen], $MEDNAFEN_VERSION)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
--AM_CONFIG_HEADER([include/config.h:include/config.h.in])
-+AC_CONFIG_HEADERS([include/config.h:include/config.h.in])
- 
- AC_PROG_CC
- AC_PROG_CPP
diff --git a/games-emulation/mednafen/files/mednafen-0.9.32-cflags.patch b/games-emulation/mednafen/files/mednafen-0.9.32-cflags.patch
deleted file mode 100644
index 76b8a2e94c9f..000000000000
--- a/games-emulation/mednafen/files/mednafen-0.9.32-cflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -90,21 +90,6 @@
- 
- dnl -fno-unit-at-a-time
- 
--OPTIMIZER_FLAGS=""
--
--dnl -ffast-math removed January 12, 2013.  Don't re-add it, nor any of its sub-options(ESPECIALLY not -funsafe-math-optimizations),
--dnl it messes up certain code(NES resampler, for example) under certain conditions and alignments of the great celestial squid.
--dnl
--dnl In fact, let's explicitly disable it here with -fno-fast-math.
--dnl
--AX_CFLAGS_GCC_OPTION([-fno-fast-math], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([-fno-unsafe-math-optimizations], OPTIMIZER_FLAGS)
--
--AX_CFLAGS_GCC_OPTION([-fomit-frame-pointer], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([-finline-limit=6000], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([--param large-function-growth=800], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([--param inline-unit-growth=175], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([--param max-inline-insns-single=10000], OPTIMIZER_FLAGS)
- AX_NO_STRICT_OVERFLOW
- 
- 
-@@ -138,8 +123,8 @@
- MDFN_COMPAT_FLAGS=""
- AX_CFLAGS_GCC_OPTION([-fsigned-char], MDFN_COMPAT_FLAGS)
- 
--AC_SUBST([AM_CFLAGS], "$MDFN_COMPAT_FLAGS $WARNING_FLAGS $OPTIMIZER_FLAGS $NO_STRICT_OVERFLOW_FLAGS")
--AC_SUBST([AM_CXXFLAGS], "$MDFN_COMPAT_FLAGS $WARNING_FLAGS $OPTIMIZER_FLAGS $NO_STRICT_OVERFLOW_FLAGS")
-+AC_SUBST([AM_CFLAGS], "$MDFN_COMPAT_FLAGS $WARNING_FLAGS $NO_STRICT_OVERFLOW_FLAGS")
-+AC_SUBST([AM_CXXFLAGS], "$MDFN_COMPAT_FLAGS $WARNING_FLAGS $NO_STRICT_OVERFLOW_FLAGS")
- 
- AM_CONDITIONAL(WANT_DEBUGGER, false)
- 
diff --git a/games-emulation/mednafen/files/mednafen-0.9.32-zlib.patch b/games-emulation/mednafen/files/mednafen-0.9.32-zlib.patch
deleted file mode 100644
index a555bec79164..000000000000
--- a/games-emulation/mednafen/files/mednafen-0.9.32-zlib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- mednafen.orig/src/Makefile.am
-+++ mednafen/src/Makefile.am
-@@ -5,7 +5,7 @@
- 
- bin_PROGRAMS	=	mednafen
- mednafen_SOURCES 	= 	debug.cpp error.cpp mempatcher.cpp settings.cpp endian.cpp mednafen.cpp file.cpp general.cpp md5.cpp memory.cpp netplay.cpp state.cpp movie.cpp player.cpp PSFLoader.cpp tests.cpp qtrecord.cpp cdplay.cpp okiadpcm.cpp FileWrapper.cpp Stream.cpp MemoryStream.cpp FileStream.cpp
--mednafen_LDADD 		= 	trio/libtrio.a drivers/libmdfnsdl.a sexyal/libsexyal.a @SDL_LIBS@
-+mednafen_LDADD 		= 	trio/libtrio.a drivers/libmdfnsdl.a sexyal/libsexyal.a @SDL_LIBS@ -lminizip
- mednafen_DEPENDENCIES	=	trio/libtrio.a drivers/libmdfnsdl.a sexyal/libsexyal.a
- 
- SUBDIRS			+=	sexyal drivers
---- mednafen.orig/src/compress/Makefile.am.inc
-+++ mednafen/src/compress/Makefile.am.inc
-@@ -1 +1 @@
--mednafen_SOURCES	+=	compress/minilzo.c compress/quicklz.c compress/blz.cpp compress/ioapi.c compress/unzip.c
-+mednafen_SOURCES	+=	compress/minilzo.c compress/quicklz.c compress/blz.cpp compress/ioapi.c
---- mednafen.orig/src/file.cpp
-+++ mednafen/src/file.cpp
-@@ -33,7 +33,7 @@
- 
- 
- #include <zlib.h>
--#include "compress/unzip.h"
-+#include <minizip/unzip.h>
- 
- #include "file.h"
- #include "general.h"
diff --git a/games-emulation/mednafen/mednafen-0.9.32.ebuild b/games-emulation/mednafen/mednafen-0.9.32.ebuild
deleted file mode 100644
index 207cb7682fe2..000000000000
--- a/games-emulation/mednafen/mednafen-0.9.32.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/games-emulation/mednafen/mednafen-0.9.32.ebuild,v 1.2 2014/05/15 16:37:57 ulm Exp $
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator"
-HOMEPAGE="http://mednafen.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mednafen/${P}-wip.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa altivec cjk debugger jack nls"
-
-RDEPEND="virtual/opengl
-	media-libs/libsndfile
-	dev-libs/libcdio
-	media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/sdl-net
-	sys-libs/zlib[minizip]
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i \
-		-e 's:$(datadir)/locale:/usr/share/locale:' \
-		$(find . -name Makefile.am) \
-		intl/Makefile.in || die
-	epatch \
-		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-automake-1.13.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable cjk cjk-fonts) \
-		$(use_enable debugger) \
-		$(use_enable jack) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc Documentation/cheats.txt ChangeLog TODO
-	dohtml Documentation/*
-	prepgamesdirs
-}
diff --git a/games-emulation/nestopia/Manifest b/games-emulation/nestopia/Manifest
index 9f45c6e0519c..641112b15364 100644
--- a/games-emulation/nestopia/Manifest
+++ b/games-emulation/nestopia/Manifest
@@ -1,2 +1,3 @@
 DIST Nestopia140src.zip 2346187 SHA256 ec503320679062af260135bf38e1fa2376803c75efb74039224fb2ef3b888762 SHA512 54a7c569239c15aa9bd7a5bbe13f67b5a62baccf95f81fb55ad9578872edc11a3e456af7ea67107e96c0c88726e976203058cf971fbb527cd30b644d8d51795a WHIRLPOOL c62959e52e1366ec2966087269a6ac07998d6ae0c24cae00ec2621ea506128eb887eb10ce25ac8c8e82a6c89aea8aa7fad9351f55146ce4b16ae6f81b5c992b3
+DIST nestopia-1.46.2.tgz 1223407 SHA256 4a5065726ad9e7a120a2c6aa39b9c0904090119998a4d690d4deb5e374118fc0 SHA512 3aa87e98aa24b71e5feac5ffe8229e97d407fc0b14567b0ddbe7cc1eaca08a08f435a6fe294fbbd7066054befdfd27602db7c3c0577246b0e8addfe296404a23 WHIRLPOOL 25c43194797e5edca3abc5cb75dba126d9d246e9ab12270521e7fe6c13427b371ba9f92a71ed557271f159711411286b5ac5ab3fe06144760320531c33bf0c02
 DIST nst140_lnx_release_h.zip 250216 SHA256 0b6b11d98fabbb0319c1d0800428f8cba6631ac2808fb4618ced3d7c8d782859 SHA512 eea9b212a26f0d8c294371eeb15a22c1aba595334dd46629767af19671692bd29eda078caa96d4a91f505b4e2764861090578c63dd3715cfa0fce4af7fc39339 WHIRLPOOL 715f33a33a2dd630d35e3a7ca1acdbcdb8843139aa976686324d121fab6cd89a5e666cc952e6097563cda145e17717a823931bdb40067e9d295e747a4902d83d
diff --git a/games-emulation/nestopia/nestopia-1.46.2.ebuild b/games-emulation/nestopia/nestopia-1.46.2.ebuild
new file mode 100644
index 000000000000..8c5bb9cff128
--- /dev/null
+++ b/games-emulation/nestopia/nestopia-1.46.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestopia/nestopia-1.46.2.ebuild,v 1.3 2015/02/19 08:13:18 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+MY_P=${P/ue/}
+DESCRIPTION="A portable Nintendo Entertainment System emulator written in C++"
+HOMEPAGE="http://0ldsk00l.ca/nestopia/"
+SRC_URI="mirror://sourceforge/nestopiaue/${PV%.*}/${MY_P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="x11-libs/gtk+:3
+	media-libs/libao
+	media-libs/libsdl2[sound,joystick,video]
+	app-arch/libarchive
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i \
+		-e '/^CC /d' \
+		-e '/^CXX /d' \
+		-e '/^LDFLAGS /d' \
+		-e '/^LIBS =/ s/=/+=/' \
+		-e '/^CFLAGS / s/=/+=/' \
+		-e "/^PREFIX / s:=.*:=${GAMES_PREFIX}:" \
+		-e "/^BINDIR / s:=.*:=${GAMES_BINDIR}:" \
+		-e "/^DATADIR / s:=.*:=${GAMES_DATADIR}/${PN}:" \
+		Makefile || die
+}
+
+src_install() {
+	local res
+
+	dogamesbin ${PN}
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r NstDatabase.xml source/unix/icons
+
+	domenu source/unix/icons/nestopia.desktop
+	for res in 32 48 64 128
+	do
+		newicon -s ${res} source/unix/icons/nestopia${res}.png nestopia.png
+	done
+	doicon -s scalable source/unix/icons/nestopia.svg
+
+	dodoc AUTHORS README.* changelog.txt
+	use doc && dohtml -r readme.html doc/*.html doc/details
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-emulation/virtualjaguar/Manifest b/games-emulation/virtualjaguar/Manifest
index 11bbbfcd0985..8ca069a1a16b 100644
--- a/games-emulation/virtualjaguar/Manifest
+++ b/games-emulation/virtualjaguar/Manifest
@@ -1,2 +1 @@
-DIST virtualjaguar-1.0.7-src.tar.bz2 255401 SHA256 31309ffb2776df880729ef0ba69f973d54712ce94a0d66c1eddac375bbd365c0 SHA512 770e6534d1d59dd377ed92c38f754a417b0f8a72884ba64a22764c15132367ecd78cf66b6f1b6d7b5cddf805bae01475414dd2c10223b560a867e0682c2f175f WHIRLPOOL d479a5c531faf79ce3e9a2a1104cbbbbd7949d79df17458c7e3c83a381ae876094ffc84bf5256d6b3d09d250a695f83f05e7a8b58ce79ca24296650fbbc2bda9
 DIST virtualjaguar-2.1.2.tar.bz2 2917041 SHA256 04dac519857ef9eba24e26c1ab7c73d8b94599c613a922590826228966175368 SHA512 96b842762773631b5df25721d4913f771580c8e23c017a3572539c15a028a4e7743870f2ce3f30380f553781d3beed26693d7e04191efc1475c0cc6fef9f91fb WHIRLPOOL fe1f0991ed06a36f861a2fd1d35d0a3e1f189e07a79ce4950df3881848956217d58bc134a30b3f2241073e3e2342bc3779b47800f186179585ee948e3df59470
diff --git a/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch b/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch
deleted file mode 100644
index b98f5e1ba637..000000000000
--- a/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/cdintf_linux.cpp	2004-10-06 21:44:14.000000000 -0400
-+++ src/cdintf_linux.cpp.fix	2004-11-06 23:09:53.217375640 -0500
-@@ -217,5 +217,5 @@
- {
- 	WriteLog("CDINTF: GetTrackInfo unimplemented!\n");
- 	return 0xFF;
--
-+}
- #endif
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-array.patch b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-array.patch
deleted file mode 100644
index 1ebf07a78f4d..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-array.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- virtualjaguar-1.0.7-src/src/m68k_in.c.orig	2010-10-13 13:46:25.248611132 -0400
-+++ virtualjaguar-1.0.7-src/src/m68k_in.c	2010-10-13 13:47:09.783059297 -0400
-@@ -193,10 +193,11 @@
- 			{
- 				instr = ostruct->match | (i << 9) | j;
- 				m68ki_instruction_jump_table[instr] = ostruct->opcode_handler;
--				for(k=0;k<NUM_CPU_TYPES;k++)
-+				for(k=0;k<NUM_CPU_TYPES;k++) {
- 					m68ki_cycles[k][instr] = ostruct->cycles[k];
--				if((instr & 0xf000) == 0xe000 && (!(instr & 0x20)))
--					m68ki_cycles[0][instr] = m68ki_cycles[1][instr] = ostruct->cycles[k] + ((((j-1)&7)+1)<<1);
-+					if((instr & 0xf000) == 0xe000 && (!(instr & 0x20)))
-+						m68ki_cycles[0][instr] = m68ki_cycles[1][instr] = ostruct->cycles[k] + ((((j-1)&7)+1)<<1);
-+				}
- 			}
- 		}
- 		ostruct++;
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-gcc43.patch b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-gcc43.patch
deleted file mode 100644
index d185f0d0c093..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/sdlemu_config.cpp.old   2009-01-20 14:38:35.000000000 +0100
-+++ src/sdlemu_config.cpp       2009-01-20 14:39:44.000000000 +0100
-@@ -18,6 +18,8 @@
-  */
-
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- #include <string>
- #include <list>
- #include "sdlemu_config.h"
-
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch
deleted file mode 100644
index 996767e5b43d..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru virtualjaguar-1.0.7-src.orig/Makefile virtualjaguar-1.0.7-src/Makefile
---- virtualjaguar-1.0.7-src.orig/Makefile	2004-04-18 18:09:14.000000000 -0400
-+++ virtualjaguar-1.0.7-src/Makefile	2010-10-13 13:09:31.889211820 -0400
-@@ -6,23 +6,18 @@
- # easier for the maintainers. :-)
- #
- 
--CC         = gcc
--LD         = gcc
- TARGET     = vj$(EXESUFFIX)
- 
- # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
--CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
--		-ffast-math -fomit-frame-pointer `sdl-config --cflags`
--#		-fomit-frame-pointer `sdl-config --cflags` -g
--#		-fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
--
--LDFLAGS =
-+CFLAGS += -Wall -Wno-switch -D$(SYSTYPE) `sdl-config --cflags`
-+CXXFLAGS += -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) `sdl-config --cflags`
- 
- LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
- 
- INCS = -I. -Isrc -Isrc/include -I/usr/local/include -I/usr/include
- 
- THECC = $(CC) $(CFLAGS) $(INCS)
-+THECXX = $(CXX) $(CXXFLAGS) $(INCS)
- 
- OBJS = \
- 	obj/anajoy.o \
-@@ -70,16 +65,16 @@
- 	$(THECC) -c $< -o $@
- 
- obj/%.o: src/%.cpp src/include/%.h
--	$(THECC) -c $< -o $@
-+	$(THECXX) -c $< -o $@
- 
- obj/%.o: src/%.c
- 	$(THECC) -c $< -o $@
- 
- obj/%.o: src/%.cpp
--	$(THECC) -c $< -o $@
-+	$(THECXX) -c $< -o $@
- 
- $(TARGET): $(OBJS)
--	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- #	strip --strip-all vj$(EXESUFFIX)
- #	upx -9 vj$(EXESUFFIX)
- 
diff --git a/games-emulation/virtualjaguar/virtualjaguar-1.0.7-r1.ebuild b/games-emulation/virtualjaguar/virtualjaguar-1.0.7-r1.ebuild
deleted file mode 100644
index 6b7d120cef67..000000000000
--- a/games-emulation/virtualjaguar/virtualjaguar-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/virtualjaguar-1.0.7-r1.ebuild,v 1.2 2014/12/21 14:22:14 mgorny Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="an Atari Jaguar emulator"
-HOMEPAGE="http://www.icculus.org/virtualjaguar/"
-SRC_URI="http://www.icculus.org/virtualjaguar/tarballs/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/libsdl[sound,joystick,opengl,video]
-	sys-apps/gentoo-functions"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-	mkdir obj || die
-	edos2unix src/sdlemu_config.cpp
-	epatch \
-		"${FILESDIR}"/${PV}-cdintf_linux.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-array.patch
-
-	sed -e "s:GENTOODIR:${GAMES_BINDIR}:" \
-		"${FILESDIR}/virtualjaguar" > "${T}/virtualjaguar" || die
-}
-
-src_compile() {
-	export SYSTYPE=__GCCUNIX__ \
-		GLLIB=-lGL \
-		SDLLIBTYPE=--libs
-	emake obj/m68kops.h || die
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dogamesbin vj "${T}/virtualjaguar" || die "dogamebin failed"
-	dodoc docs/{README,TODO,WHATSNEW}
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Please run ${PN} to create the necessary directories"
-	elog "in your home directory.  After that you may place ROM files"
-	elog "in ~/.vj/ROMs and they will be detected when you run virtualjaguar."
-	elog "You may then select which ROM to run from inside the emulator."
-	elog
-	elog "If you have previously run a version of ${PV} please note that"
-	elog "the location of the ROMs has changed."
-}
diff --git a/games-engines/gemrb/Manifest b/games-engines/gemrb/Manifest
index 27166691eabe..b414d753b1ac 100644
--- a/games-engines/gemrb/Manifest
+++ b/games-engines/gemrb/Manifest
@@ -1,2 +1 @@
-DIST gemrb-0.8.1.tar.gz 12278911 SHA256 7426022f52faf8e8d41e3b456dd2c126f989c11b011d5fea37fe2bd201bbc8bc SHA512 3b8f6280172d5871b397f262fe34cfd307425f85c78c2fb5708dbea6f5557ff8508f86589956c2b7d60410a03ad6979841511ea09e749ffcd9ddbacaa6410c26 WHIRLPOOL 48664536feec8522f4aa815b758becccfdd8860a91d5c81416e22f9347b8f173444b66bcf62c0e069b7e335f797b00a2a8531af8ef4a35c28fb19f032ace0ea3
 DIST gemrb-0.8.2.tar.gz 12302710 SHA256 57cc267f730d205774fa5a6db1f0dd88b97a8193dbece905d70cb50e433774ee SHA512 2a666537ca540f041122bcd1117cf591c5a223480a5c4c18eebaef6b446fc355c6078d54fcbc3a89b8ba35d7ecbaf53648394e383f0479e84da999fccea1f496 WHIRLPOOL 4ad8a39b937467e7e7a28dbae1d3d449789259124bb0be6dc916ef1396da9b3027ded802d906311ff53785288f423ae7d6fd4d3f339782fa259d6bb3de1c4a31
diff --git a/games-engines/gemrb/gemrb-0.8.1.ebuild b/games-engines/gemrb/gemrb-0.8.1.ebuild
deleted file mode 100644
index bf0eea309916..000000000000
--- a/games-engines/gemrb/gemrb-0.8.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.8.1.ebuild,v 1.3 2014/08/14 16:54:34 phajdan.jr Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-WANT_CMAKE=always
-inherit eutils python cmake-utils gnome2-utils games
-
-DESCRIPTION="Reimplementation of the Infinity engine"
-HOMEPAGE="http://gemrb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/freetype
-	media-libs/libpng:0
-	>=media-libs/libsdl-1.2[video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl-mixer
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-pkg_setup() {
-	python_set_active_version 2
-	games_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/COPYING/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBIN_DIR="${GAMES_BINDIR}"
-		-DDATA_DIR="${GAMES_DATADIR}/gemrb"
-		-DSYSCONF_DIR="${GAMES_SYSCONFDIR}/gemrb"
-		-DLIB_DIR="$(games_get_libdir)"
-		-DMAN_DIR=/usr/share/man/man6
-		-DICON_DIR=/usr/share/pixmaps
-		-DMENU_DIR=/usr/share/applications
-		-DDOC_DIR="/usr/share/doc/${PF}"
-		-DSVG_DIR=/usr/share/icons/hicolor/scalable/apps
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README NEWS AUTHORS
-	prepgamesdirs
-	prepalldocs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/love/love-0.7.2-r1.ebuild b/games-engines/love/love-0.7.2-r1.ebuild
index 48d1c8f8f44e..a7e8977d951d 100644
--- a/games-engines/love/love-0.7.2-r1.ebuild
+++ b/games-engines/love/love-0.7.2-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.7.2-r1.ebuild,v 1.6 2014/07/06 13:20:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.7.2-r1.ebuild,v 1.7 2015/02/18 19:43:24 mr_bones_ Exp $
 
-EAPI=3
-
-inherit base games
+EAPI=5
+inherit games
 
 DESCRIPTION="A framework for 2D games in Lua"
 HOMEPAGE="http://love2d.org/"
@@ -31,10 +30,9 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-HEAD
 
-DOCS=( "readme.txt" "changes.txt" )
-
 src_install() {
-	base_src_install
+	DOCS="readme.txt changes.txt" \
+		default
 	if [[ "${SLOT}" != "0" ]]; then
 		mv "${ED}${GAMES_BINDIR}"/${PN} \
 			"${ED}${GAMES_BINDIR}"/${PN}-${SLOT} || die
diff --git a/games-engines/love/love-0.8.0.ebuild b/games-engines/love/love-0.8.0.ebuild
index 1773a093c860..fc600b40d283 100644
--- a/games-engines/love/love-0.8.0.ebuild
+++ b/games-engines/love/love-0.8.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.8.0.ebuild,v 1.11 2015/01/07 09:21:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.8.0.ebuild,v 1.12 2015/02/18 19:43:24 mr_bones_ Exp $
 
 EAPI=5
-
-inherit base games
+inherit games
 
 if [[ ${PV} == 9999* ]]; then
 	inherit autotools mercurial
@@ -28,7 +27,7 @@ RDEPEND="dev-games/physfs
 	media-libs/devil[mng,png,tiff]
 	media-libs/freetype
 	media-libs/libmodplug
-	media-libs/libsdl[joystick,opengl]
+	media-libs/libsdl[joystick,opengl,video]
 	media-libs/libvorbis
 	media-libs/openal
 	media-sound/mpg123
@@ -37,8 +36,6 @@ DEPEND="${RDEPEND}
 	media-libs/libmng
 	media-libs/tiff"
 
-DOCS=( "readme.md" "changes.txt" )
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]]; then
 		sh platform/unix/gen-makefile || die
@@ -49,7 +46,8 @@ src_prepare() {
 }
 
 src_install() {
-	default
+	DOCS="readme.md changes.txt" \
+		default
 	if [[ "${SLOT}" != "0" ]]; then
 		mv "${ED}${GAMES_BINDIR}"/${PN} \
 			"${ED}${GAMES_BINDIR}"/${PN}-${SLOT} || die
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
index 68d6396b87e3..fb2335ff51a3 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1,2 +1 @@
-DIST qtads-2.1.5.tar.bz2 2566534 SHA256 bc0d4b22e8d42a670f2ffc38fd179ef71c50886c2f55704070a1987b3cd7ee37 SHA512 0debd1ce4aec1e3aee1f3764ca2c7cce039da255c6337ce49b6407c6ca66b5c28c2af283857e88961abd2548fe064bc4c1017e29287206a63762382503fe8731 WHIRLPOOL 296ce8c019650193f40f5c536c2d621c3f1fa7f70eb58b0232e986925f2ba2f5f57c5c8ea2028c195dcc7360142f1cfbc729d50e0531a42d68575da216ec5ed3
 DIST qtads-2.1.6.tar.bz2 2523761 SHA256 33f29b4c1b225f1a1e7ad1405a1bb7eb8ec4b1d567eac48a120071f7793373c8 SHA512 bd61f6531e2af3484bca06952c174feb2e1157f3f6f8b77e292c724cabb11f31cc413afe4dfb566a216d64702df033033d0667bd4dcb64478b3cd0cf3142dd3e WHIRLPOOL 90814bedfae9b07ff9eb02f070253970aba512c6f1736939c17ba1206e8043c60d5b07f65f94014f191696d339f522762ad3a8e866e624b796c4380b9abfd03a
diff --git a/games-engines/qtads/qtads-2.1.5.ebuild b/games-engines/qtads/qtads-2.1.5.ebuild
deleted file mode 100644
index 668d64486911..000000000000
--- a/games-engines/qtads/qtads-2.1.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/qtads/qtads-2.1.5.ebuild,v 1.7 2014/05/15 16:42:46 ulm Exp $
-
-EAPI=4
-inherit eutils gnome2-utils fdo-mime qt4-r2 games
-
-DESCRIPTION="Multimedia interpreter for TADS text adventures"
-HOMEPAGE="http://qtads.sourceforge.net"
-SRC_URI="mirror://sourceforge/qtads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound]
-	media-libs/sdl-mixer[midi,vorbis]
-	media-libs/sdl-sound[mp3]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake4 qtads.pro -after CONFIG-=silent
-}
-
-src_install() {
-	dogamesbin qtads
-	doman qtads.6
-	dodoc AUTHORS BUGS HTML_TADS_LICENSE NEWS README
-	newicon -s 256 qtads_256x256.png ${PN}.png
-	insinto /usr/share/icons
-	doins -r icons/hicolor
-	insinto /usr/share/mime/packages
-	doins icons/qtads.xml
-	make_desktop_entry qtads QTads qtads Game "GenericName=TADS Multimedia Interpreter\nMimeType=application/x-tads;application/x-t3vm-image;"
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/residualvm/Manifest b/games-engines/residualvm/Manifest
index bd0da05489e8..b172037f1d44 100644
--- a/games-engines/residualvm/Manifest
+++ b/games-engines/residualvm/Manifest
@@ -1,2 +1 @@
-DIST residualvm-0.1.1-sources.tar.bz2 4734395 SHA256 99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963 SHA512 6fec148222727d9b949826dc7c2e8af2c7515a0cd73f553c64a4c994d25d4911cbe6b0dbf23dac69b8caa5dbf184916831d39899a1553c47978208b45fa81937 WHIRLPOOL 336151c24bb76cf7a8cce83c19873e271bccc8d78ea92236de260e3692361d9a8d9b9ec1931b4fbc21998d8a5e33d974f30f40b267d8800dcb268aab7dcd96bd
 DIST residualvm-0.2.1-sources.tar.bz2 5533814 SHA256 cd2748a665f80b8c527c6dd35f8435e718d2e10440dca10e7765574c7402d924 SHA512 9eed93770ef1ad828934c32e937b861c93f1ebbb0d936f3f56668e654588f734dc88e29446f0a69f8f26475e96b8ce7ca85318758b99aabc9586756692c721da WHIRLPOOL fd055dc5f85ae653f38f6de6a4d80aad32aa77164ab997fb2cc64cd23284b1af7531d9a1076cdd903e6edc8bf48b6e455c42f0adb997ea7eeda660d958e3319b
diff --git a/games-engines/residualvm/residualvm-0.1.1.ebuild b/games-engines/residualvm/residualvm-0.1.1.ebuild
deleted file mode 100644
index 70cd0132210d..000000000000
--- a/games-engines/residualvm/residualvm-0.1.1.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/games-engines/residualvm/residualvm-0.1.1.ebuild,v 1.2 2014/05/15 16:43:06 ulm Exp $
-
-EAPI=5
-inherit eutils toolchain-funcs gnome2-utils games
-
-DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
-HOMEPAGE="http://www.residualvm.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# TODO: fix dynamic plugin support
-# games crash without media-libs/libsdl[alsa]
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/freetype:2
-	media-libs/libsdl[X,sound,alsa,joystick,opengl,video]
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# not an autotools script
-	# most configure options currently do nothing, recheck on version bump !!!
-	# disable explicitly, otherwise we get unneeded linkage (some copy-paste build system)
-	./configure \
-		--disable-debug \
-		--enable-all-engines \
-		--backend=sdl \
-		--enable-release-mode \
-		--disable-tremor \
-		--disable-sparkle \
-		--prefix="${GAMES_PREFIX}" \
-		--datadir="${GAMES_DATADIR}/${PN}" \
-		--libdir="$(games_get_libdir)" \
-		--docdir="/usr/share/doc/${PF}" \
-		--disable-libunity \
-		--disable-faad \
-		--disable-flac \
-		--disable-fluidsynth \
-		--disable-mad \
-		--disable-translation \
-		--disable-vorbis \
-		--enable-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake \
-		VERBOSE_BUILD=1 \
-		AR="$(tc-getAR) cru" \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	dogamesbin residualvm
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins gui/themes/modern.zip dists/engine-data/residualvm-grim-patch.lab
-
-	doicon -s scalable icons/${PN}.svg
-	doicon -s 256 icons/${PN}.png
-	domenu dists/${PN}.desktop
-
-	doman dists/${PN}.6
-	dodoc AUTHORS README KNOWN_BUGS TODO
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild
index 1a739f6aa979..d09f264148d0 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild,v 1.5 2014/10/27 16:05:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild,v 1.6 2015/02/19 06:22:02 mr_bones_ Exp $
 
 EAPI=5
 WX_GTK_VER=2.8
@@ -29,24 +29,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	rm -rf *.bat dists/win32
-
-	sed -ri \
-		-e '/^(CC|CXX)\b/d' \
-		Makefile || die
-
-	local boost_ver=$(best_version ">=dev-libs/boost-1.32")
-
-	boost_ver=${boost_ver/*boost-/}
-	boost_ver=${boost_ver%.*}
-	boost_ver=${boost_ver/./_}
-
-	einfo "Using boost version ${boost_ver}"
-	append-cxxflags \
-        -I/usr/include/boost-${boost_ver}
-	append-ldflags \
-        -L/usr/$(get_libdir)/boost-${boost_ver}
-	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
-	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
+	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
 }
 
 src_configure() {
@@ -61,8 +44,7 @@ src_configure() {
 		$(use_enable iconv freetype) \
 		$(use_enable mad) \
 		$(use_enable png) \
-		$(use_enable vorbis) \
-		|| die
+		$(use_enable vorbis) || die
 }
 
 src_install() {
diff --git a/games-engines/stratagus/stratagus-2.2.7.ebuild b/games-engines/stratagus/stratagus-2.2.7.ebuild
index 4f1fa38b4918..5ed1464223b1 100644
--- a/games-engines/stratagus/stratagus-2.2.7.ebuild
+++ b/games-engines/stratagus/stratagus-2.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.7.ebuild,v 1.3 2015/02/13 04:55:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.7.ebuild,v 1.4 2015/02/19 09:03:38 ago Exp $
 
 EAPI=5
 inherit cmake-utils eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://launchpad.net/stratagus/trunk/${PV}/+download/stratagus_${PV}.or
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="bzip2 debug doc mikmod mng theora vorbis"
 
 RDEPEND="dev-db/sqlite:3
diff --git a/games-kids/gcompris/gcompris-14.12.ebuild b/games-kids/gcompris/gcompris-14.12.ebuild
index eddce0643c60..aa0c589238b1 100644
--- a/games-kids/gcompris/gcompris-14.12.ebuild
+++ b/games-kids/gcompris/gcompris-14.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-14.12.ebuild,v 1.2 2015/02/18 08:25:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-14.12.ebuild,v 1.3 2015/02/19 09:03:33 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://gcompris.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="gstreamer"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-mud/kildclient/Manifest b/games-mud/kildclient/Manifest
index 8778915b7895..a258192a6847 100644
--- a/games-mud/kildclient/Manifest
+++ b/games-mud/kildclient/Manifest
@@ -1,2 +1 @@
-DIST kildclient-2.9.0.tar.gz 1671444 SHA256 1332d8bb083d88fdad04e06a6ffaa30e6c1c0e03e3463934761aa407abb8b544 SHA512 73f3c75c8f0aa147d641b91c5a3f87ff47d08276ed57607a81e2dac17c43cc7a2590edf53bca2d193e8b3462eeae33d7b6dcaa26ac9b320090b86ab1f9d2feea WHIRLPOOL b931041fa4151919c45767854a0acddb3bb0e13b7262b0cbfdd5e37a3c9e26905e82544d9ce3c4d5305aa978369760cef3b974b239ade5afff0007436f304761
 DIST kildclient-3.0.1.tar.gz 1838526 SHA256 6f7bb508392403d31ca8bb2317025671792f9e942be862c2b55462ce4b9e295c SHA512 835b31b2e45a5895fd4aefcb662d6c3bf2c888836f12511ef7bc6c15a12dac8563bc9226dbc33fb75915fdf6024ed61a0a05185d0998646ba380410d6e33a706 WHIRLPOOL f30b0f3c29f269adc0a37b815b232d7396f8f7fd388d8643368af66c3dde0507ff0f32382b5bee18a5f4aaa83e204ccebbf97019185ed1278e05fc8dcb06326c
diff --git a/games-mud/kildclient/files/kildclient-2.9.0-gentoo.patch b/games-mud/kildclient/files/kildclient-2.9.0-gentoo.patch
deleted file mode 100644
index 74f84a0bd947..000000000000
--- a/games-mud/kildclient/files/kildclient-2.9.0-gentoo.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -ru kildclient-2.9.0.orig/Makefile.am kildclient-2.9.0/Makefile.am
---- kildclient-2.9.0.orig/Makefile.am	2009-02-01 07:46:53.000000000 -0500
-+++ kildclient-2.9.0/Makefile.am	2009-11-02 17:35:21.625377149 -0500
-@@ -11,11 +11,7 @@
-           share
- endif
- 
--pkgdocdir = $(datadir)/doc/kildclient
--
--pkgdoc_DATA = README AUTHORS NEWS COPYING
--
--appsdir = $(datadir)/applications
-+appsdir = /usr/share/applications
- apps_DATA = kildclient.desktop
- 
- EXTRA_DIST = getperlflags.pl \
-diff -ru kildclient-2.9.0.orig/doc/C/Makefile.am kildclient-2.9.0/doc/C/Makefile.am
---- kildclient-2.9.0.orig/doc/C/Makefile.am	2009-02-01 07:46:53.000000000 -0500
-+++ kildclient-2.9.0/doc/C/Makefile.am	2009-11-02 17:35:21.625377149 -0500
-@@ -2,9 +2,9 @@
- 
- SUBDIRS = images
- 
--pkgdocdir = $(datadir)/doc/kildclient
-+pkgdocdir = @docdir@
- 
--manualdir = $(pkgdocdir)/html
-+manualdir = @htmldir@
- 
- #pkgdoc_DATA = kildclient.pdf
- 
-diff -ru kildclient-2.9.0.orig/kildclient.desktop kildclient-2.9.0/kildclient.desktop
---- kildclient-2.9.0.orig/kildclient.desktop	2009-01-11 14:45:06.000000000 -0500
-+++ kildclient-2.9.0/kildclient.desktop	2009-11-02 17:35:21.625377149 -0500
-@@ -4,7 +4,7 @@
- Exec=kildclient
- Icon=kildclient
- Terminal=false
--Categories=Network;RolePlaying;
-+Categories=Game;Network;RolePlaying;
- 
- Name=KildClient
- Name[eo]=KildClient
-diff -ru kildclient-2.9.0.orig/po/Makefile.in.in kildclient-2.9.0/po/Makefile.in.in
---- kildclient-2.9.0.orig/po/Makefile.in.in	2009-05-23 17:35:41.000000000 -0400
-+++ kildclient-2.9.0/po/Makefile.in.in	2009-11-02 17:35:21.625377149 -0500
-@@ -28,9 +28,8 @@
- datarootdir = @datarootdir@
- datadir = @datadir@
- libdir = @libdir@
--localedir = $(libdir)/locale
--gnulocaledir = $(datadir)/locale
--gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-+localedir = @localedir@
-+gnulocaledir = @localedir@
- subdir = po
- 
- INSTALL = @INSTALL@
-@@ -161,17 +160,6 @@
- 	    fi; \
- 	  fi; \
- 	done
--	if test "$(PACKAGE)" = "glib"; then \
--	  if test -r "$(MKINSTALLDIRS)"; then \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
--	  else \
--	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
--	  fi; \
--	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
--			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
--	else \
--	  : ; \
--	fi
- 
- # Define this as empty until I found a useful application.
- installcheck:
-@@ -186,9 +174,6 @@
- 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- 	done
--	if test "$(PACKAGE)" = "glib"; then \
--	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
--	fi
- 
- check: all
- 
-diff -ru kildclient-2.9.0.orig/share/Makefile.am kildclient-2.9.0/share/Makefile.am
---- kildclient-2.9.0.orig/share/Makefile.am	2009-02-01 07:46:53.000000000 -0500
-+++ kildclient-2.9.0/share/Makefile.am	2009-11-02 17:35:21.626376565 -0500
-@@ -6,7 +6,7 @@
- 		kildclient.hlp \
- 		kcworld.dtd
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = /usr/share/pixmaps
- pixmap_DATA = kildclient.png kildclient.xpm
- 
- 
-diff -ru kildclient-2.9.0.orig/src/Makefile.am kildclient-2.9.0/src/Makefile.am
---- kildclient-2.9.0.orig/src/Makefile.am	2009-05-23 15:41:42.000000000 -0400
-+++ kildclient-2.9.0/src/Makefile.am	2009-11-02 17:35:21.626376565 -0500
-@@ -61,14 +61,14 @@
- 
- EXTRA_DIST = $(pkgdata_DATA)
- 
--pkgdocdir = $(datadir)/doc/kildclient
-+pkgdocdir = @docdir@
- 
--manualdir = $(pkgdocdir)/html
-+manualdir = @htmldir@
- 
- 
- kildclient_LDADD = $(KILDCLIENT_LIBS) $(KILDCLIENT_PERL_LIBS) $(GTKSPELL_LIBS) $(LIBGNUTLS_LIBS) $(INTLLIBS)
- 
--localedir = $(datadir)/locale
-+localedir = @localedir@
- 
- INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
-            -DPKGDATADIR=\"$(pkgdatadir)\" \
-diff -ru kildclient-2.9.0.orig/src/mainwindow.c kildclient-2.9.0/src/mainwindow.c
---- kildclient-2.9.0.orig/src/mainwindow.c	2009-02-02 13:34:41.000000000 -0500
-+++ kildclient-2.9.0/src/mainwindow.c	2009-11-02 17:36:29.851126172 -0500
-@@ -169,9 +169,9 @@
-   glade_xml_signal_autoconnect(gladexml);
- #ifndef __WIN32__
-   gtk_window_set_icon_from_file(GTK_WINDOW(window),
--                                SYSDATADIR "/pixmaps/kildclient.png",
-+                                "/usr/share/pixmaps/kildclient.png",
-                                 NULL);
--  gtk_window_set_default_icon_from_file(SYSDATADIR "/pixmaps/kildclient.png",
-+  gtk_window_set_default_icon_from_file("/usr/share/pixmaps/kildclient.png",
-                                         NULL);
- #endif
- 
diff --git a/games-mud/kildclient/files/kildclient-2.9.0-underlink.patch b/games-mud/kildclient/files/kildclient-2.9.0-underlink.patch
deleted file mode 100644
index 4f3a385270b5..000000000000
--- a/games-mud/kildclient/files/kildclient-2.9.0-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.old	2011-06-20 09:20:15.000000000 +0200
-+++ src/Makefile.am	2011-06-20 09:20:25.000000000 +0200
-@@ -66,7 +66,7 @@
- manualdir = @htmldir@
- 
- 
--kildclient_LDADD = $(KILDCLIENT_LIBS) $(KILDCLIENT_PERL_LIBS) $(GTKSPELL_LIBS) $(LIBGNUTLS_LIBS) $(INTLLIBS)
-+kildclient_LDADD = $(KILDCLIENT_LIBS) $(KILDCLIENT_PERL_LIBS) $(GTKSPELL_LIBS) $(LIBGNUTLS_LIBS) $(INTLLIBS) -lz
- 
- localedir = @localedir@
- 
diff --git a/games-mud/kildclient/kildclient-2.9.0.ebuild b/games-mud/kildclient/kildclient-2.9.0.ebuild
deleted file mode 100644
index ed1e86cb4677..000000000000
--- a/games-mud/kildclient/kildclient-2.9.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/kildclient/kildclient-2.9.0.ebuild,v 1.8 2015/01/04 03:02:40 mr_bones_ Exp $
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="Powerful MUD client with a built-in PERL interpreter"
-HOMEPAGE="http://kildclient.sourceforge.net"
-SRC_URI="mirror://sourceforge/kildclient/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc gnutls spell"
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/libglade
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libintl
-	spell? ( app-text/gtkspell:2 )
-	gnutls? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--localedir=/usr/share/locale \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		$(use_with spell gtkspell) \
-		$(use_with gnutls libgnutls) \
-		$(use_with doc docs)
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-puzzle/amoebax/amoebax-0.2.1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
index 0d728163e4ff..3ca89f5515f8 100644
--- a/games-puzzle/amoebax/amoebax-0.2.1.ebuild
+++ b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.1.ebuild,v 1.1 2014/07/07 17:58:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.1.ebuild,v 1.2 2015/02/19 09:05:47 ago Exp $
 
 EAPI=5
 inherit autotools eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
 
 LICENSE="FreeArt GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
index 92fbc448a9f5..d23925397394 100644
--- a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
+++ b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild,v 1.7 2014/06/20 07:57:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild,v 1.8 2015/02/19 09:06:12 ago Exp $
 
 EAPI=5
 inherit eutils flag-o-matic qt4-r2 games
@@ -13,7 +13,7 @@ SRC_URI="http://${PN}.sintegrial.com/files/${MY_P}.7z"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXrandr
diff --git a/games-puzzle/colorcode/Manifest b/games-puzzle/colorcode/Manifest
index 12ee62536ebc..007ba5ce75e1 100644
--- a/games-puzzle/colorcode/Manifest
+++ b/games-puzzle/colorcode/Manifest
@@ -1 +1 @@
-DIST ColorCode-0.7.2.tar.gz 236580 SHA256 d1c5bf4d65c81de16c4159c2c69c096fc7ff47cca587d7233985e078d63c79aa
+DIST ColorCode-0.7.2.tar.gz 236580 SHA256 d1c5bf4d65c81de16c4159c2c69c096fc7ff47cca587d7233985e078d63c79aa SHA512 e45eedc2bb5f9f3d110c5c6b0531c5180d5f68532b9b50fe7767073ce068faef52d718337f93eef43d3325bd741a67660a3e53b6ee0ffc6d9371806a8bf324ce WHIRLPOOL ee82b0f78f461f000f3459f5a621045170c56986131907efaa1d4b5cbabcc72b2b47a8de31b2ca09adf21234aa24c1cb9c5a0ac12907c8b860d6ad0ddd192c7c
diff --git a/games-puzzle/colorcode/colorcode-0.7.2.ebuild b/games-puzzle/colorcode/colorcode-0.7.2.ebuild
index b6a6fe404e5f..1d06db228f77 100644
--- a/games-puzzle/colorcode/colorcode-0.7.2.ebuild
+++ b/games-puzzle/colorcode/colorcode-0.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/colorcode/colorcode-0.7.2.ebuild,v 1.4 2013/03/02 21:18:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/colorcode/colorcode-0.7.2.ebuild,v 1.5 2015/02/18 19:52:11 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils qt4-r2 games
 
 MY_PN=ColorCode
@@ -16,6 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
@@ -29,7 +30,7 @@ src_configure() {
 }
 
 src_install() {
-	dogamesbin ${PN} || die
+	dogamesbin ${PN}
 	newicon img/cc64.png ${PN}.png
 	make_desktop_entry ${PN} ${MY_PN}
 	prepgamesdirs
diff --git a/games-puzzle/concentration/concentration-1.2-r1.ebuild b/games-puzzle/concentration/concentration-1.2-r1.ebuild
index a460d4cc0ff8..20152f5cf179 100644
--- a/games-puzzle/concentration/concentration-1.2-r1.ebuild
+++ b/games-puzzle/concentration/concentration-1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/concentration/concentration-1.2-r1.ebuild,v 1.5 2014/05/15 16:50:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/concentration/concentration-1.2-r1.ebuild,v 1.6 2015/02/18 20:20:08 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="The classic memory game with some new life"
@@ -18,13 +18,13 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-image[png]
 	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	newicon pics/set1/19.png ${PN}.png
 	make_desktop_entry ${PN} Concentration
-	dodoc AUTHORS ChangeLog
 	prepgamesdirs
 }
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index 9428c102fc64..c2837d62767f 100644
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,3 +1,2 @@
 DIST connectagram-1.0.1-src.tar.bz2 263808 SHA256 6d3696b69f09eda26cdd2a42fe4d91de3effc4757c68f5109b19c1d4d6510e37 SHA512 747a34c7f42a7ac4b09178bc10d17124429d06d257b9e6f25cf800ecb2c06037611871c45bc67c17eda690ea77bba7c59661d1730a3bd01fb0aa0ccd82244aeb WHIRLPOOL 70b126c2b7e0a8d96f6b447348196549163bc90a47049bde2801bbe06feddfdc3ecd43ae688b333719a8292984ca0a10813fe7d94aa19ccfdc03530e97550a58
-DIST connectagram-1.1.2-src.tar.bz2 1415066 SHA256 06e03fed6d7651383cf8d771d0e89e09bb149c0aef431c1374296e62319087c4 SHA512 1dcc7b5a7992ed8656614ca9d86207574d0cd4557a02a0688b1572740d3f3f496f587705647dac9bc7c616491ee0800ca925aa5218769159da58f24f696dddda WHIRLPOOL b33b5644ef7f3b5b5c352c31ebde5515b7edb3bb5e42bc77cd9261d28284c2e81e097f98b54ac5bf6cce7fe2ff3cf6df6bd82d8af85f388feced0fcf37d75f58
 DIST connectagram-1.2.1-src.tar.bz2 1632426 SHA256 0a559243a8d970bb79c6791214be879269fc073b5eaec6aa55fb60be82f140bb SHA512 0266af5680e7f76d517f60934afc6115c1118832fef237803b1b3d8c0fb785e5c312d585b099f24f4c476f124ca9722868a159dc4d1a9a8a695e9cdfa4f9c1c6 WHIRLPOOL 3862fee2f4a87c6d7a78bbbaa64713b640df2c0020dfb542eb5655b77c687ca105380ac96c29dc18a324ad90f8942d503044b25971d64c7862925290eccafdca
diff --git a/games-puzzle/connectagram/connectagram-1.1.2.ebuild b/games-puzzle/connectagram/connectagram-1.1.2.ebuild
deleted file mode 100644
index b92d8b026f99..000000000000
--- a/games-puzzle/connectagram/connectagram-1.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/connectagram-1.1.2.ebuild,v 1.1 2014/08/26 05:37:35 mr_bones_ Exp $
-
-EAPI=5
-inherit eutils gnome2-utils qt4-r2 games
-
-DESCRIPTION="A word unscrambling game"
-HOMEPAGE="http://gottcode.org/connectagram/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-qt/qtcore-4.6:4
-	>=dev-qt/qtgui-4.6:4"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	sed -i \
-		-e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
-		-e "s#@GAMES_DATADIR@#${GAMES_DATADIR}#" \
-		${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die
-}
-
-src_configure() {
-	qt4-r2_src_configure
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc ChangeLog
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	games_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	games_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/connectagram/files/connectagram-1.1.2-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.1.2-gentoo.patch
deleted file mode 100644
index 8aae286bd427..000000000000
--- a/games-puzzle/connectagram/files/connectagram-1.1.2-gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- connectagram-1.1.1.orig/connectagram.pro
-+++ connectagram-1.1.1/connectagram.pro
-@@ -70,16 +70,16 @@
- 
- unix: !macx {
- 	isEmpty(PREFIX) {
--		PREFIX = /usr/local
-+		PREFIX = /usr
- 	}
- 	isEmpty(BINDIR) {
--		BINDIR = bin
-+		BINDIR = @GAMES_BINDIR@
- 	}
- 
--	target.path = $$PREFIX/$$BINDIR/
-+	target.path = @GAMES_BINDIR@/
- 
- 	data.files = data
--	data.path = $$PREFIX/share/connectagram/
-+	data.path = @GAMES_DATADIR@/connectagram/
- 
- 	pixmap.files = icons/connectagram.xpm
- 	pixmap.path = $$PREFIX/share/pixmaps/
-@@ -91,7 +91,7 @@
- 	desktop.path = $$PREFIX/share/applications/
- 
- 	qm.files = translations/*.qm
--	qm.path = $$PREFIX/share/connectagram/translations
-+	qm.path = @GAMES_DATADIR@/connectagram/translations/
- 
- 	INSTALLS += target pixmap icon desktop data qm
- }
---- connectagram-1.1.1.orig/src/locale_dialog.cpp
-+++ connectagram-1.1.1/src/locale_dialog.cpp
-@@ -87,6 +87,7 @@
- 		paths.append(appdir);
- 		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
- 		paths.append(appdir + "/../Resources");
-+		paths.append("@GAMES_DATADIR@/connectagram");
- 	}
- 	foreach (const QString& path, paths) {
- 		if (QFile::exists(path + "/translations/")) {
---- connectagram-1.1.1.orig/src/new_game_dialog.cpp
-+++ connectagram-1.1.1/src/new_game_dialog.cpp
-@@ -48,7 +48,7 @@
- 	m_wordlist = new WordList(this);
- 	m_wordlist->setLanguage(WordList::defaultLanguage());
- 	m_languages_box = new QComboBox(this);
--	QStringList languages = QDir("connectagram:").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-+	QStringList languages = QDir("@GAMES_DATADIR@/connectagram/data").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
- 	foreach (const QString& language, languages) {
- 		m_languages_box->addItem(LocaleDialog::languageName(language), language);
- 	}
---- connectagram-1.1.1.orig/src/wordlist.cpp
-+++ connectagram-1.1.1/src/wordlist.cpp
-@@ -91,9 +91,9 @@
- 
- QString WordList::defaultLanguage() {
- 	QString language = QLocale().name();
--	if (!QFile::exists("connectagram:" + language)) {
-+	if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
- 		language = language.left(2);
--		if (!QFile::exists("connectagram:" + language)) {
-+		if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
- 			language = "en";
- 		}
- 	}
-@@ -112,7 +112,7 @@
- 	m_maximum_length(0)
- {
- 	// Read words from disk
--	QFile file("connectagram:" + language + "/words");
-+	QFile file("@GAMES_DATADIR@/connectagram/data/" + language + "/words");
- 	if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
- 		return;
- 	}
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
index 0c67f68f77f2..3e76b3aff0dc 100644
--- a/games-puzzle/cuyo/Manifest
+++ b/games-puzzle/cuyo/Manifest
@@ -1 +1,2 @@
+DIST cuyo-2.0.0.tar.gz 3821330 SHA256 531cfb989087199f643ac4b18ff9cc50793cc3fa07ee06f394f73d153c09ae34 SHA512 5a25b7807b904731acc386c6b77bee82820f85a5be1ca8cf20f2b37a79f08af3649c95311b6bc656bf8780cbd99a122f7908576a424bba1439c7e5bd586ec214 WHIRLPOOL dfe71ccfb69a86dc22ed9585a6a296e82ff42b1300f65e9b30c4c17b01a1057fe1ffb2b2d5dc5d1b6c0846d8a93be409785322d94f01f18f1465687ba11bdbb4
 DIST cuyo-2.~-1.1.tar.gz 3005426 SHA256 7157aa70ae731c17e765fba11736866f2020826ad6187d8df6c55039d4481de6 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787 WHIRLPOOL ef2817feecbe9c785e8d6438aca123247857c8f9845421a5aef89375b0f9c15a050d0e6f16791cab408f8e87a9640ef0cbc77c9cc89f03c5e788d3851b07af2d
diff --git a/games-puzzle/cuyo/cuyo-2.0.0.ebuild b/games-puzzle/cuyo/cuyo-2.0.0.ebuild
new file mode 100644
index 000000000000..5fab57f514e6
--- /dev/null
+++ b/games-puzzle/cuyo/cuyo-2.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/cuyo-2.0.0.ebuild,v 1.1 2015/02/18 22:31:39 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools eutils gnome2-utils games
+
+DESCRIPTION="highly addictive and remotely related to tetris"
+HOMEPAGE="http://www.karimmi.de/cuyo/"
+SRC_URI="http://savannah.nongnu.org/download/cuyo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+music"
+
+RDEPEND="sys-libs/zlib
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer
+	music? ( media-libs/sdl-mixer[mod] )
+	media-libs/sdl-image
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/cuyo/cuyo-2.1.1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
index 4c059f55e1e0..eafdf7e3fa3a 100644
--- a/games-puzzle/cuyo/cuyo-2.1.1.ebuild
+++ b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/cuyo-2.1.1.ebuild,v 1.7 2014/05/15 16:50:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/cuyo-2.1.1.ebuild,v 1.8 2015/02/18 20:37:41 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit autotools eutils gnome2-utils versionator games
 
 MY_P=${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)
@@ -20,6 +20,7 @@ DEPEND="sys-libs/zlib
 	media-libs/sdl-mixer
 	music? ( media-libs/sdl-mixer[mod] )
 	media-libs/sdl-image"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -31,8 +32,7 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
 	prepgamesdirs
 }
 
diff --git a/games-puzzle/cuyo/files/cuyo-2.0.0-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.0.0-gentoo.patch
new file mode 100644
index 000000000000..473ef3209f29
--- /dev/null
+++ b/games-puzzle/cuyo/files/cuyo-2.0.0-gentoo.patch
@@ -0,0 +1,32 @@
+diff -ru cuyo-2.0.0.orig/icons/Makefile.am cuyo-2.0.0/icons/Makefile.am
+--- cuyo-2.0.0.orig/icons/Makefile.am	2012-01-12 12:51:05.000000000 -0500
++++ cuyo-2.0.0/icons/Makefile.am	2015-02-18 17:19:55.320961943 -0500
+@@ -17,7 +17,7 @@
+ #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #
+ 
+-desktopdir = $(datarootdir)/applications
++desktopdir = /usr/share/applications
+ desktop_DATA = cuyo.desktop
+ 
+ 
+@@ -32,7 +32,7 @@
+ #	echo "Exec=$(bindir)/cuyo" >> cuyo.desktop
+ 
+ 
+-iconsdir = $(datarootdir)/icons/hicolor
++iconsdir = /usr/share/icons/hicolor
+ nobase_icons_DATA = 32x32/apps/cuyo.png 64x64/apps/cuyo.png
+ 
+ EXTRA_DIST = $(nobase_icons_DATA) cuyo.desktop
+diff -ru cuyo-2.0.0.orig/icons/cuyo.desktop cuyo-2.0.0/icons/cuyo.desktop
+--- cuyo-2.0.0.orig/icons/cuyo.desktop	2011-03-26 11:20:01.000000000 -0400
++++ cuyo-2.0.0/icons/cuyo.desktop	2015-02-18 17:19:26.506082349 -0500
+@@ -4,7 +4,6 @@
+ Type=Application
+ Terminal=false
+ Categories=Game;BlocksGame;
+-Encoding=UTF-8
+ Comment=Play a tetris like game with many levels
+ Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
+ Exec=cuyo
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
index 60ed1fffaf2f..9ad50b067fb5 100644
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
+++ b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
@@ -1,6 +1,5 @@
-diff -ur cuyo-2.~-1.1.orig/src/stringzeug.h cuyo-2.~-1.1/src/stringzeug.h
---- cuyo-2.~-1.1.orig/src/stringzeug.h	2006-07-03 20:26:23.000000000 +0300
-+++ cuyo-2.~-1.1/src/stringzeug.h	2009-12-29 16:17:18.000000000 +0200
+--- cuyo-2.~-1.1.orig/src/stringzeug.h
++++ cuyo-2.~-1.1/src/stringzeug.h
 @@ -20,7 +20,7 @@
  
  #include <config.h>
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
index 38b8c4224463..78bafe2ded47 100644
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
+++ b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru cuyo-2.~-1.1.orig/icons/Makefile.am cuyo-2.~-1.1/icons/Makefile.am
---- cuyo-2.~-1.1.orig/icons/Makefile.am	2007-12-20 12:22:32.000000000 -0500
-+++ cuyo-2.~-1.1/icons/Makefile.am	2009-12-30 13:44:39.111042770 -0500
+--- cuyo-2.~-1.1.orig/icons/Makefile.am
++++ cuyo-2.~-1.1/icons/Makefile.am
 @@ -1,4 +1,4 @@
 -desktopdir = $(datadir)/applications
 +desktopdir = /usr/share/applications
@@ -16,9 +15,8 @@ diff -ru cuyo-2.~-1.1.orig/icons/Makefile.am cuyo-2.~-1.1/icons/Makefile.am
  icons_DATA = cuyo-32x32.png cuyo-64x64.png
  
  install-iconsDATA:
-diff -ru cuyo-2.~-1.1.orig/icons/cuyo.desktop cuyo-2.~-1.1/icons/cuyo.desktop
---- cuyo-2.~-1.1.orig/icons/cuyo.desktop	2007-12-20 12:22:32.000000000 -0500
-+++ cuyo-2.~-1.1/icons/cuyo.desktop	2009-12-30 13:45:15.823781932 -0500
+--- cuyo-2.~-1.1.orig/icons/cuyo.desktop
++++ cuyo-2.~-1.1/icons/cuyo.desktop
 @@ -3,9 +3,8 @@
  Icon=cuyo
  Type=Application
diff --git a/games-puzzle/einstein/einstein-2.0.ebuild b/games-puzzle/einstein/einstein-2.0.ebuild
index 9450bf143c4c..e4585eb0d183 100644
--- a/games-puzzle/einstein/einstein-2.0.ebuild
+++ b/games-puzzle/einstein/einstein-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/einstein/einstein-2.0.ebuild,v 1.11 2014/05/15 16:50:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/einstein/einstein-2.0.ebuild,v 1.12 2015/02/18 21:33:41 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="A puzzle game inspired by Albert Einstein"
@@ -18,6 +18,7 @@ IUSE=""
 DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}*.patch
@@ -33,9 +34,9 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin "${PN}" || die
+	dogamesbin "${PN}"
 	insinto "${GAMES_DATADIR}/${PN}/res"
-	doins einstein.res || die
+	doins einstein.res
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "Einstein Puzzle"
 	prepgamesdirs
diff --git a/games-puzzle/fbg/Manifest b/games-puzzle/fbg/Manifest
index 061a9ea3d900..f8bfb943ae61 100644
--- a/games-puzzle/fbg/Manifest
+++ b/games-puzzle/fbg/Manifest
@@ -1 +1 @@
-DIST fbg-0.9.tar.gz 1127384 RMD160 1e39de48b3b6a5f4954fd90f801b7f59564a1b3e SHA1 a0386babb53dd797764c41998612711156416da2 SHA256 189b86f00345fb6cbfdf0c8d55c495960d373b653972fad5fad2f47ba46274e5
+DIST fbg-0.9.tar.gz 1127384 SHA256 189b86f00345fb6cbfdf0c8d55c495960d373b653972fad5fad2f47ba46274e5 SHA512 8aede56515da472509068037bd295d7a37f365dd54ea8332c02409e84bf685b76f1733b93b90fa49ca58e9094a4506137c6459d4761a929cfa2e60bb0907a353 WHIRLPOOL 4df0aa39485f5533407f8b2388cce42081acb5b75f00b6b4e5fc49a0e84ff35abcec705d566cf99ac5c083f6453f65d5dee2e1f1b05680cc00acc0b068628b99
diff --git a/games-puzzle/fbg/fbg-0.9-r1.ebuild b/games-puzzle/fbg/fbg-0.9-r1.ebuild
index 32bd8b84b904..4cca80395e97 100644
--- a/games-puzzle/fbg/fbg-0.9-r1.ebuild
+++ b/games-puzzle/fbg/fbg-0.9-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fbg/fbg-0.9-r1.ebuild,v 1.11 2008/02/29 19:28:25 carlo Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fbg/fbg-0.9-r1.ebuild,v 1.12 2015/02/18 21:45:09 tupone Exp $
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="A Tetris clone written in OpenGL"
@@ -19,10 +19,9 @@ DEPEND="virtual/opengl
 	media-libs/libsdl
 	media-libs/libmikmod
 	x11-libs/libXt"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e "/FBGDATADIR=/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
 		-e '/^datadir=/d' \
@@ -30,16 +29,14 @@ src_unpack() {
 		|| die "sed failed"
 }
 
-src_compile() {
-	egamesconf --disable-fbglaunch || die
-	emake || die "emake failed"
+src_configure() {
+	egamesconf --disable-fbglaunch
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	newicon startfbg/icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Falling Block Game" ${PN}
-	dodoc AUTHORS ChangeLog README TODO
 	rm -rf "${D}/${GAMES_PREFIX}"/doc
 	prepgamesdirs
 }
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
index a6fc8e659dc8..7b48414fe761 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild,v 1.6 2014/05/15 16:51:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild,v 1.7 2015/02/18 21:54:23 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit autotools eutils games
 
 DATA_PV="1.0.0"
@@ -41,17 +41,15 @@ src_prepare() {
 
 src_configure() {
 	egamesconf \
-		--disable-dependency-tracking \
 		--datadir="${GAMES_DATADIR}/${PN}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
 	insinto "${GAMES_DATADIR}/${PN}"
 	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
 	rm -f COPYING
-	doins -r * || die "doins failed"
+	doins -r *
 	newicon images/icon.png ${PN}.png
 	make_desktop_entry fillets "Fish Fillets NG"
 	prepgamesdirs
diff --git a/games-puzzle/gottet/gottet-1.0.6.ebuild b/games-puzzle/gottet/gottet-1.0.6.ebuild
index 3cb452a27eb5..e09fd2543219 100644
--- a/games-puzzle/gottet/gottet-1.0.6.ebuild
+++ b/games-puzzle/gottet/gottet-1.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gottet/gottet-1.0.6.ebuild,v 1.1 2014/05/18 19:36:54 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gottet/gottet-1.0.6.ebuild,v 1.2 2015/02/19 09:05:18 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtcore:4
diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
index 75d3865c087a..bd3e96c350f9 100644
--- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild
+++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.17 2014/05/15 16:53:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.18 2015/02/18 22:57:46 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit autotools eutils games
 
 DESCRIPTION="A falling block game similar to Blockout"
@@ -20,14 +20,14 @@ DEPEND="virtual/opengl
 	media-libs/libsdl[sound,opengl,video]
 	media-libs/sdl-mixer[mod]
 	media-libs/sdl-image[png]"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${P/s/S}
 
 src_prepare() {
 	sed -i \
 		-e 's:DATA_DIR:"'${GAMES_DATADIR}'\/'${PN/s/S}\/'":g' \
-		game/main.cpp \
-		|| die "sed main.cpp failed"
+		game/main.cpp || die
 
 	sed -i \
 		-e 's:png12:png:g' \
@@ -45,14 +45,11 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf \
-		--disable-dependency-tracking \
-		--disable-optimize
+	egamesconf --disable-optimize
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	DOCS="TODO.txt" default
 	rm -f "${D}/${GAMES_BINDIR}"/Packer
-	dodoc TODO.txt
 	prepgamesdirs
 }
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index 0565a777c9c0..77c7361a630f 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,3 +1,2 @@
 DIST tanglet-1.2.1-src.tar.bz2 7814483 SHA256 94f4c5c76020ec1fe502ff076fbe5471e497d4b7bcabd1e9059e1022d1ce80c8 SHA512 25cb7d5f3884e32298562ca3c9655e4386f07a03911f436253d249d741f2ffad10646c3d37370da56e749b36e8926b3543e6f5f7ae560550a1c1efaf254fb121 WHIRLPOOL 71228788ef49538abca37ff54ff19d11806ba9d4f485bb9707402d635cc8089aa118653995d58dd4c2186fd72f6de96eaf86159fb9061777f0d9968a44df1a72
-DIST tanglet-1.2.2-src.tar.bz2 8102968 SHA256 c90d5c36b7e6cca54cdc001c7eecfb333795add16e6ae01f100026c61f4a84da SHA512 bf990a802d96f1c1c8a108696b9a46c223fa126a4415227ef200a14c3cdb80c7e9574785c02e3711b002a8daef2c4aff575ab323b6b2f41359f88f9adf5b5765 WHIRLPOOL a5ef1f3a17f56a4e5c0c00db1332a7898422d29b33dcb66237c177a4fd625e9377b2f0148a0486dcd76612daec9ee820c3eed5a9a021c92449bb8b1be850c493
 DIST tanglet-1.3.1-src.tar.bz2 8461603 SHA256 d0eab174eaa8cdd5f3499ae275db4cd720172ef28346273db7f5988f2304e0d8 SHA512 b939ca45f26baf8e7e32da8775e673707472e5cd07d344642eeb15986ff99319e0ab1bacf78e2ea49f004ec67a6d081a91c939cf7c75228a195654d429235625 WHIRLPOOL e2ee97327b95b502b603c953c4b42636fd060f8476bd0787f4d7527c9ebf04774868bd0f923f5b7e89e24e4123143b87e8d9859087685fd62d83c46da26b145d
diff --git a/games-puzzle/tanglet/files/tanglet-1.2.2-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.2.2-datadir.patch
deleted file mode 100644
index 6e5b46d7c7e0..000000000000
--- a/games-puzzle/tanglet/files/tanglet-1.2.2-datadir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/locale_dialog.cpp.old
-+++ src/locale_dialog.cpp
-@@ -85,7 +85,7 @@
- 	if (paths.isEmpty()) {
- 		QString appdir = QCoreApplication::applicationDirPath();
- 		paths.append(appdir);
--		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
-+		paths.append("@GENTOO_DATADIR@");
- 		paths.append(appdir + "/../Resources");
- 	}
- 	foreach (const QString& path, paths) {
---- src/main.cpp.old
-+++ src/main.cpp
-@@ -46,7 +46,7 @@
- 	QString path = app.applicationDirPath();
- 	QStringList paths;
- 	paths.append(path + "/data/");
--	paths.append(path + "/../share/tanglet/data/");
-+	paths.append("@GENTOO_DATADIR@/data/");
- 	paths.append(path + "/../Resources/data/");
- 	QDir::setSearchPaths("tanglet", paths);
- 
diff --git a/games-puzzle/tanglet/tanglet-1.2.2.ebuild b/games-puzzle/tanglet/tanglet-1.2.2.ebuild
deleted file mode 100644
index da562e9269ea..000000000000
--- a/games-puzzle/tanglet/tanglet-1.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tanglet/tanglet-1.2.2.ebuild,v 1.3 2015/02/11 05:25:07 mr_bones_ Exp $
-
-EAPI=5
-LANGS="cs de es en fr he hu it nl ro tr uk"
-LANGSLONG="es_CL"
-inherit eutils gnome2-utils qt4-r2 games
-
-DESCRIPTION="A single player word finding game based on Boggle"
-HOMEPAGE="http://gottcode.org/tanglet/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-datadir.patch
-	sed -i -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		src/locale_dialog.cpp \
-		src/main.cpp || die
-}
-
-src_configure() {
-	qt4-r2_src_configure
-}
-
-src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data
-	#translations
-	insinto "${GAMES_DATADIR}"/${PN}/translations/
-	for lang in ${LINGUAS};do
-		for x in ${LANGS};do
-			if [[ ${lang} == ${x} ]];then
-				doins translations/${PN}_${x}.qm
-			fi
-		done
-	done
-
-	insinto /usr/share/icons
-	doins -r icons/hicolor
-
-	dodoc ChangeLog CREDITS NEWS
-
-	doicon icons/${PN}.xpm
-	domenu icons/${PN}.desktop
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	games_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	games_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
index fe258210bec9..12b72813a060 100644
--- a/games-puzzle/tetrinet/tetrinet-0.11.ebuild
+++ b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.15 2014/11/10 08:43:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.16 2015/02/19 09:04:58 ago Exp $
 
 EAPI=5
 inherit eutils flag-o-matic games toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://tetrinet.or.cz/download/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="ipv6"
 
 RDEPEND=">=sys-libs/ncurses-5"
diff --git a/games-puzzle/textmaze/textmaze-1.2.ebuild b/games-puzzle/textmaze/textmaze-1.2.ebuild
index 823c48a3e63b..ad60ea4d5436 100644
--- a/games-puzzle/textmaze/textmaze-1.2.ebuild
+++ b/games-puzzle/textmaze/textmaze-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/textmaze/textmaze-1.2.ebuild,v 1.6 2015/02/11 06:26:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/textmaze/textmaze-1.2.ebuild,v 1.7 2015/02/19 09:06:17 ago Exp $
 
 EAPI=5
 inherit games
@@ -12,7 +12,7 @@ SRC_URI="http://www.robobunny.com/projects/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Curses"
diff --git a/games-puzzle/tod/tod-0.ebuild b/games-puzzle/tod/tod-0.ebuild
index d5418a3facb7..ed198e27539e 100644
--- a/games-puzzle/tod/tod-0.ebuild
+++ b/games-puzzle/tod/tod-0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tod/tod-0.ebuild,v 1.8 2014/07/07 16:23:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tod/tod-0.ebuild,v 1.9 2015/02/19 09:06:07 ago Exp $
 
 EAPI=5
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://www.pineight.com/pc/win${PN}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/allegro:0[X]"
diff --git a/games-puzzle/wmpuzzle/Manifest b/games-puzzle/wmpuzzle/Manifest
index 4c5683311b26..46793e45e61d 100644
--- a/games-puzzle/wmpuzzle/Manifest
+++ b/games-puzzle/wmpuzzle/Manifest
@@ -1,3 +1,2 @@
 DIST wmpuzzle-0.5.0.tar.gz 81900 SHA256 1986777eefdf51a7dc17929b447d39ea455042ad319d734cfbba572a00476608 SHA512 22643a805f318e0818c1788e3f0c1efdbc221ba3b3656636748ac22e3bda03a8a892cf1a9e6d5a1686ca8c859bc6343b1d7698c17f61d0933fe3ad24be3611eb WHIRLPOOL 9ce84f9f5726028120ef81b608dab930bd696f74751bce17714483ce42de31232c6bb13c33cefd06825a41671dec81e1b9a22023fd05d739fae41c47c3d0c0dc
-DIST wmpuzzle-0.5.1.tar.gz 87611 SHA256 796abeac42debf31f7270c22ed82de0eda154a534127fd80f5265558aa1806e5 SHA512 4b2b06f038b483080630ea1fa1a6b12ab2fc312efbbfd48191c5dba8efff78b67f38078c28035532c03eee2ba8cbeef07ba2a46f0099226a5f4f31d324a3ee94 WHIRLPOOL 6ad04efdfcdc5007f81dcadcd0d28d0fb99375d505c98ebcf4d53abe5c5074d58fee0a5a53d7c9d651d48d7bba8fcf009cf9266f2bf084c93c4eeea59e4a3538
 DIST wmpuzzle-0.5.2.tar.gz 87373 SHA256 b48b9ddb0b0bb85fd9fa3aef859984bce77b5f5faa6dad9366d00c1862a74b9b SHA512 7d171d307e3829005dff4d718161655785e87129b07917d494bb498eff904adafc7c6f83e71f996759ee9e365fe70c67858a5ec9d2647fe573e0a1505126f6c0 WHIRLPOOL 8d91e237b85ccc46ca27308f7c4e69b1cc00d9602d7e679fe6340d7442dc4c7a47c8b2bef07ae1ccc4c0998fdee0b54d55ccfa9c9dfe85eb55ec3a7a5ba93508
diff --git a/games-puzzle/wmpuzzle/wmpuzzle-0.5.1.ebuild b/games-puzzle/wmpuzzle/wmpuzzle-0.5.1.ebuild
deleted file mode 100644
index 4baae38ec4f6..000000000000
--- a/games-puzzle/wmpuzzle/wmpuzzle-0.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/wmpuzzle/wmpuzzle-0.5.1.ebuild,v 1.3 2015/02/11 21:04:03 mr_bones_ Exp $
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="wmpuzzle provides a 4x4 puzzle on a 64x64 mini window"
-HOMEPAGE="http://freecode.com/projects/wmpuzzle"
-SRC_URI="http://people.debian.org/~godisch/wmpuzzle/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-S=${WORKDIR}/${P}/src
-
-src_install() {
-	dogamesbin ${PN}
-
-	dodoc ../{CHANGES,README}
-	newicon -s 48 numbers.xpm ${PN}.xpm
-	doman ${PN}.6
-	make_desktop_entry ${PN}
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	games_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	games_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest
index 553a1390616d..67878eae8843 100644
--- a/games-roguelike/crossfire-client/Manifest
+++ b/games-roguelike/crossfire-client/Manifest
@@ -1 +1,2 @@
 DIST crossfire-client-1.70.0.tar.gz 801043 SHA256 afa3981785689baa22813ebc3893250c2f73374dda64bfc1dc41e64f4adc60b2 SHA512 ce5b07cd6de03bd2dd28bbb85798ff26ad6764ee5490ba3920b160f6aa109bf5ae409d98855081b4498c3e8fee2e04f2f64a03553366d5f283bca516880e3bd7 WHIRLPOOL b407206deefc5aad6dadabfd37895938587209d3af395cd2a630062fa4102056dd66c01d3e2924d4ae633851b85807735b1d6225eba35194c1c4654181df206e
+DIST crossfire-client-1.71.0.tar.bz2 761156 SHA256 5427655e756ffb48e75c1d9dc3200afab81efa7f2f00ffdf5dfee51918d5819d SHA512 86710d684fd7908ea9aaf5ba20bff0f1ba01ff0ba90c3e2847afff9d0db6f60c7b671413c8888b513c992fbf27474e744b79df185d5e2c04afc9d2dce3d8665e WHIRLPOOL 7a51aac98d4df3f057e201f900faa2fc5f46c180cc57e11db063307fce4510823cc8ef4da62c72bff9dc9a66756de71b93b2dd2e7e759b02c376c7d973d10f9e
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild
new file mode 100644
index 000000000000..df5f87b32889
--- /dev/null
+++ b/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild,v 1.1 2015/02/19 01:58:28 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools eutils toolchain-funcs gnome2-utils games
+
+DESCRIPTION="Client for the nethack-style but more in the line of UO"
+HOMEPAGE="http://crossfire.real-time.com/"
+SRC_URI="mirror://sourceforge/crossfire/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa lua opengl oss sdl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	opengl? ( virtual/opengl
+		media-libs/freeglut )
+	x11-libs/gtk+:2
+	gnome-base/libglade
+	sdl? ( media-libs/libsdl[video]
+		media-libs/sdl-image[png] )
+	lua? ( dev-lang/lua )
+	net-misc/curl
+	media-libs/libpng:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -ri -e '/^.TH/s:$: 6:' $(find . -name "*man") || die
+}
+
+src_configure() {
+	# bugs in configure script so we cant use $(use_enable ...)
+	local myconf
+
+	use sdl || myconf="${myconf} --disable-sdl"
+	use alsa || myconf="${myconf} --disable-alsa9 --disable-alsa"
+	if ! use alsa && ! use oss ; then
+		myconf="${myconf} --disable-sound"
+	fi
+	egamesconf ${myconf}
+}
+
+src_compile() {
+	# bug 139785
+	if use alsa || use oss ; then
+		emake -j1 -C sound-src AR="$(tc-getAR)"
+	fi
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local s
+
+	default
+	domenu gtk-v2/crossfire-client.desktop
+	for s in 16 32 48
+	do
+		newicon -s ${s} pixmaps/${s}x${s}.png ${PN}.png
+	done
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-roguelike/ivan/Manifest b/games-roguelike/ivan/Manifest
index 423a4b23a4f5..5924cbdb9802 100644
--- a/games-roguelike/ivan/Manifest
+++ b/games-roguelike/ivan/Manifest
@@ -1 +1 @@
-DIST ivan-0.50.tar.gz 803651 RMD160 7e84340cd8fdfbdaaf7fde730fc0a76b137e2e91 SHA1 e4c5ae2b9bdfd59a0ed3c87a504043df12b0f1a4 SHA256 d8bc588ad902f27906ab34c2f8a9cace03867b45ff6a57025e046931f36ad480
+DIST ivan-0.50.tar.gz 803651 SHA256 d8bc588ad902f27906ab34c2f8a9cace03867b45ff6a57025e046931f36ad480 SHA512 5f08e35deb03826b7fe0bbfd977b3fc70af6dd1da3b91f80f20b423413580752ac9a6e72f39504c2dceda6139ee411e876ece5d584b754e6dbc7c4146bd12044 WHIRLPOOL 25ec6418d7f01ca4086224734260090db0e2f978aa0750b064209446dc788e81e6983203a9c519a405b30ce609d3ae5af6672f9170617dc0229ead4a6f31c044
diff --git a/games-roguelike/ivan/ivan-0.50.ebuild b/games-roguelike/ivan/ivan-0.50.ebuild
index 4aee0305e9a0..a52679ac99d8 100644
--- a/games-roguelike/ivan/ivan-0.50.ebuild
+++ b/games-roguelike/ivan/ivan-0.50.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/ivan/ivan-0.50.ebuild,v 1.10 2009/09/24 23:03:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/ivan/ivan-0.50.ebuild,v 1.11 2015/02/18 19:14:15 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils flag-o-matic games
 
 DESCRIPTION="Rogue-like game with SDL graphics"
@@ -14,12 +14,15 @@ SLOT="0"
 KEYWORDS="~ppc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="media-libs/libsdl"
+DEPEND="media-libs/libsdl[video]"
+RDEPEND=${DEPEND}
 
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-install.patch
-	"${FILESDIR}"/${P}-gcc43.patch )
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-install.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+}
 
 src_configure() {
 	replace-flags -O? -O0 #bug #113627
@@ -27,8 +30,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog LICENSING NEWS README
+	default
 	keepdir "${GAMES_STATEDIR}/ivan/Bones"
 	prepgamesdirs
 	fperms g+w "${GAMES_STATEDIR}/ivan/Bones"
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index ce3565eab2ac..85752091a12a 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,2 +1 @@
-DIST tomenet-4.5.5.tar.bz2 2787559 SHA256 788a3dbbcb24ad747763a1ff4e80d859d521ac29df3da1d33842e5c39ecbd197 SHA512 2908783062058dfc8c6a29e8a13c658f9222e95b01add3749cfe3cd9edc8ed3478c273bf0963668e8a5b53a6119aa2979a5eb0d50dd386c0b87436ab7be57536 WHIRLPOOL 75d731785deaf31e52986e35faeccc5b4486641b441ad37c367986a800dacd69286104dd22c8fc7ff389f8807826e6cd290b6831d27df7482c23efca1ee83881
 DIST tomenet-4.5.9.tar.bz2 3012187 SHA256 40ce5068e2ee10ad051241d5c44423bb74a9ef4054260ee692adeccc9b46d4c7 SHA512 1e13e37b209ab274fb6aeafeb270cff0590ffa352b91b61970194e968826bed3fd365c210238a48b067d0882bac737c70250d8846acc816e3c3ac0b3b843ee1d WHIRLPOOL c9106d27be0e9f173eae24d12f79b75818b1dd23d2c1c93dd4a1a707de6ddaf7538de0dce73216d4a32a290245cd4c09dd26bbc3b54e811484a3a44bb2945fa6
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.5-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.5-makefile.patch
deleted file mode 100644
index d42c608e7b2e..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.5.5-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/makefile
-+++ src/makefile
-@@ -203,7 +203,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
- 
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
- 
- 
- # For variations with X11
- X11BASE = /usr/X11R6
- 
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
- 
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -256,8 +266,9 @@
- # attempt to "guess" at many of these flags based on your system.
- #
- ## With SDL
--CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags`
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
-+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
- ##
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
-@@ -357,9 +368,6 @@
- # Compile a client with 'test client' version/tag
- tomenet.test: CFLAGS += -DTEST_CLIENT -O0
- 
--# Normal release build
--tomenet: CFLAGS += -O2
--
- 
- # Lua
- SRCS += $(LUASRCS)
diff --git a/games-roguelike/tomenet/tomenet-4.5.5.ebuild b/games-roguelike/tomenet/tomenet-4.5.5.ebuild
deleted file mode 100644
index 7304c1a4868e..000000000000
--- a/games-roguelike/tomenet/tomenet-4.5.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.5.ebuild,v 1.5 2015/02/18 09:13:13 mr_bones_ Exp $
-
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="http://www.tomenet.net/"
-SRC_URI="http://www.tomenet.net/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
-
-RDEPEND="sys-libs/ncurses
-	!dedicated? (
-		X? (
-			x11-libs/libX11
-		)
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
-	sed \
-		-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
-	if use server || use dedicated ; then
-		sed \
-			-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
-	fi
-
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server evilmeta" "$(usex server "all" "tomenet")")"
-	emake \
-		$(usex dedicated "" "$(usex X "USE_X=1" "")") \
-		$(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
-		-f makefile \
-		${mytargets[@]}
-}
-
-src_install() {
-	dodoc ../TomeNET-Guide.txt
-
-	if ! use dedicated ; then
-		newgamesbin ${PN} ${PN}.bin
-		dogamesbin "${T}"/${PN}
-
-		doicon -s 48 client/tomenet4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server || use dedicated ; then
-		newgamesbin tomenet.server tomenet.server.bin
-		dogamesbin "${T}"/${PN}.server accedit evilmeta
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use sound; then
-		elog "You can get soundpacks from here:"
-		elog '  http://tomenet.net/downloads.php'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/dear-esther/dear-esther-20130608.ebuild b/games-rpg/dear-esther/dear-esther-20130608.ebuild
index ee3f094538c1..b8ffc8f712c2 100644
--- a/games-rpg/dear-esther/dear-esther-20130608.ebuild
+++ b/games-rpg/dear-esther/dear-esther-20130608.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/dear-esther/dear-esther-20130608.ebuild,v 1.2 2014/10/15 10:20:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/dear-esther/dear-esther-20130608.ebuild,v 1.3 2015/02/19 10:40:06 ago Exp $
 
 # TODO: unbundle libSDL2
 
@@ -15,7 +15,7 @@ SRC_URI="dearesther-linux-${TIMESTAMP}-bin"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-rpg/freedink/freedink-108.4.ebuild b/games-rpg/freedink/freedink-108.4.ebuild
index 6493f1244696..a2857218b03d 100644
--- a/games-rpg/freedink/freedink-108.4.ebuild
+++ b/games-rpg/freedink/freedink-108.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedink/freedink-108.4.ebuild,v 1.2 2015/02/08 22:01:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedink/freedink-108.4.ebuild,v 1.3 2015/02/19 10:40:27 ago Exp $
 
 EAPI=5
 inherit games
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/games-rpg/valyriatear/valyriatear-1.0.0.ebuild b/games-rpg/valyriatear/valyriatear-1.0.0.ebuild
index 345a82594f9d..cd5238afefb5 100644
--- a/games-rpg/valyriatear/valyriatear-1.0.0.ebuild
+++ b/games-rpg/valyriatear/valyriatear-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/valyriatear/valyriatear-1.0.0.ebuild,v 1.1 2014/09/06 15:03:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/valyriatear/valyriatear-1.0.0.ebuild,v 1.2 2015/02/19 10:41:02 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Bertram25/ValyriaTear/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+ GPL-3 CC-BY-SA-3.0 CC-BY-3.0 CC0-1.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug editor nls"
 
 RDEPEND="
diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest
index a4f5d6aea4b4..e9ef2c65e2ca 100644
--- a/games-server/crossfire-server/Manifest
+++ b/games-server/crossfire-server/Manifest
@@ -1,2 +1,5 @@
 DIST crossfire-1.70.0.maps.tar.gz 28911538 SHA256 64b1bccef796fde9559a84b4486cf380710b9db70c2c45a1b0f67adf3d822aa9 SHA512 6c6349033950fc0bc60938d9784e420a4f594fdb6c3e0f281591445ae6c9e073caf1c5bb6627f0fe7f4b7a7a8afeafa1b41e948dbdfd9fe8fef1f41857afa06a WHIRLPOOL b5d1869b84f314dc054eadb22a5cfa83bb1721fcc1417b83e36586f2e3f65a90f2593eaecbb0e808d200aed563a5060961a1312d0afb0d9885b2a304263a8c48
 DIST crossfire-1.70.0.tar.gz 6626864 SHA256 f6679aa19f7b041a779d26215a7f0062ab7a1fd96185527c207485e084b4654d SHA512 c19f52aaf2292cacb47f186603d6a48769e84aea2973d5fa9028594001706a3e13452e540f2352e279c2f49a839282efb2624a0fd177b1729a2a6df0a5db4fc5 WHIRLPOOL 39652a4dc9c2d1096721c1462378a5b9481194ab1e0188a4bcbe9b8ebbd4981d5dea176cf243a8d23ed133df97dfaebf4831e5a5a5a446d75aa8ebf37daa47d8
+DIST crossfire-1.71.0.arch.tar.bz2 3462161 SHA256 016ee33b15879a96e14932a9209d03ee9e3da69b3f3bd6b82c800f43345f064d SHA512 f9707dc5dab24d0ba74654c6433e016a58ab4e99da5dade6614491eca00736965bb7fd9a24db4188c3409a0479a88bb0ea55282e519ffcbabf23d82e6a5b975e WHIRLPOOL 3c2776bda5f14804eee234731e2cd14fc98d77d06fea24c4be5838c4df236b642dbada63e629e1268fb987fe6b00c98d5960fb5dc7c9e608e996103ffa16a441
+DIST crossfire-1.71.0.maps.tar.bz2 19463076 SHA256 f6df5fd605dd3b83dce1aa730390443b09569e6fae93bef058cd8f52fedc17da SHA512 c3940b0a48f1badc14eb81610cfcd4241d140b666b5cb123845dca6ad742a18977ad7ada1d75d738f15f44374896c4dd6047989122257d7cd87362a3af0f97e8 WHIRLPOOL 5ea6a027b8d0a04e89f77eae74308655d82936fa8f492a75238ee5b665b4cc5a49598db3f3119808ca9403bb62d32b4da8d1cfd981a8e7f43001571d178bd516
+DIST crossfire-1.71.0.tar.bz2 6712638 SHA256 cc1917db207628c34d2222f1b6c416481f72f185ac3bc9e49b9a53db94fe1e1d SHA512 d867f3393cb18ed78158c9a724d386dd642f0193ace86fef592e7bdc80885b7f7ce3c37be34b77d73b31c939d41e533029f2e7dea405c00d7a67aa3baebd146d WHIRLPOOL 484d57f2d7f0138b35e3eb4c2fc08a2e462de6ddccde3b413bd141161bc1239283a966a2a3ebeeabef56b311e90d9cd86cba4a322e6152d930fa7d9a5ceb4267
diff --git a/games-server/crossfire-server/crossfire-server-1.71.0.ebuild b/games-server/crossfire-server/crossfire-server-1.71.0.ebuild
new file mode 100644
index 000000000000..83184316a2c2
--- /dev/null
+++ b/games-server/crossfire-server/crossfire-server-1.71.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.71.0.ebuild,v 1.2 2015/02/19 03:56:18 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils games
+
+MY_P="${P/-server/}"
+DESCRIPTION="server for the crossfire clients"
+HOMEPAGE="http://crossfire.real-time.com/"
+SRC_URI="mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.tar.bz2
+	mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.maps.tar.bz2
+	mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.arch.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+RESTRICT="test"
+
+DEPEND="net-misc/curl
+	X? (
+		x11-libs/libXaw
+		media-libs/libpng:0
+	)"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205
+	ln -s "${WORKDIR}/arch" "${S}/lib" || die
+}
+
+src_configure() {
+	egamesconf --disable-static
+}
+
+src_compile() {
+	# work around the collect.pl locking
+	emake -j1 -C lib
+	emake
+}
+
+src_install() {
+	default
+	keepdir "${GAMES_STATEDIR}"/crossfire/{account,datafiles,maps,players,template-maps,unique-items}
+	insinto "${GAMES_DATADIR}/crossfire"
+	doins -r "${WORKDIR}/maps"
+	prune_libtool_files --modules
+	prepgamesdirs
+}
diff --git a/games-simulation/crashtest/Manifest b/games-simulation/crashtest/Manifest
index e4c90366b243..dcd50f19a3ea 100644
--- a/games-simulation/crashtest/Manifest
+++ b/games-simulation/crashtest/Manifest
@@ -1 +1 @@
-DIST crashtest-1.1.tar.gz 134769 SHA256 55c5ce29857263ceebc1c3f42c153f275dfc47711e9248395fd4398d6ef52ab9
+DIST crashtest-1.1.tar.gz 134769 SHA256 55c5ce29857263ceebc1c3f42c153f275dfc47711e9248395fd4398d6ef52ab9 SHA512 f361b5f202cdcdca871357eb2a2158af2958f4058b6754c63dc5a20c3e08e2ef532e984596d0daac073f2321b2db02e3f8c2a0a4998450fc953c1661d712d59c WHIRLPOOL 272352015016844afe6f02fff92be96b6f52e0c2cdfb2e545cc3a2f6e5196f4825bd99c971b89c371be18c6b983e5b04a1bbe739df5cae7c8579ac6319ea80cd
diff --git a/games-simulation/crashtest/crashtest-1.1.ebuild b/games-simulation/crashtest/crashtest-1.1.ebuild
index 5bd685bc8a3d..d65bd0bf0d49 100644
--- a/games-simulation/crashtest/crashtest-1.1.ebuild
+++ b/games-simulation/crashtest/crashtest-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/crashtest/crashtest-1.1.ebuild,v 1.5 2014/04/10 06:33:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/crashtest/crashtest-1.1.ebuild,v 1.6 2015/02/18 19:42:07 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils flag-o-matic games
@@ -31,14 +31,12 @@ src_prepare() {
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
 		-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
-		Makefile ${PN}.cxx \
-		|| die "sed failed"
+		Makefile ${PN}.cxx || die
 	append-flags -DHAVE_ISNANF
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README
+	default
 	make_desktop_entry ${PN} Crashtest
 	prepgamesdirs
 }
diff --git a/games-simulation/openttd/openttd-1.4.4.ebuild b/games-simulation/openttd/openttd-1.4.4.ebuild
index 2f780cebf87e..32531f52b348 100644
--- a/games-simulation/openttd/openttd-1.4.4.ebuild
+++ b/games-simulation/openttd/openttd-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.4.4.ebuild,v 1.3 2015/02/15 22:43:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.4.4.ebuild,v 1.4 2015/02/19 09:05:57 ago Exp $
 
 EAPI=5
 inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
 RESTRICT="test" # needs a graphics set in order to test
 
diff --git a/games-simulation/senken/senken-0.3.0.ebuild b/games-simulation/senken/senken-0.3.0.ebuild
index e1f67ed24c4a..e8189926baa8 100644
--- a/games-simulation/senken/senken-0.3.0.ebuild
+++ b/games-simulation/senken/senken-0.3.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/senken-0.3.0.ebuild,v 1.11 2014/10/30 15:31:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/senken-0.3.0.ebuild,v 1.12 2015/02/18 19:10:31 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils games
 
 DESCRIPTION="city simulation game"
-HOMEPAGE="http://www.contrib.andrew.cmu.edu/~tmartin/senken/"
+HOMEPAGE="http://savannah.nongnu.org/projects/senken/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/games-simulation/singularity/singularity-0.30c.ebuild b/games-simulation/singularity/singularity-0.30c.ebuild
deleted file mode 100644
index ee982611046a..000000000000
--- a/games-simulation/singularity/singularity-0.30c.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.30c.ebuild,v 1.6 2013/06/29 17:00:40 slyfox Exp $
-
-EAPI=2
-inherit eutils games
-
-MUSIC=endgame-${PN}-music-006
-DESCRIPTION="A simulation of a true AI. Go from computer to computer, pursued by the entire world"
-HOMEPAGE="http://www.emhsoft.com/singularity/"
-SRC_URI="http://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
-	music? ( http://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
-
-LICENSE="GPL-2 CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+music"
-
-RDEPEND="=dev-lang/python-2*
-	dev-python/pygame
-	dev-python/numpy
-	media-libs/sdl-mixer[vorbis]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_prepare() {
-	rm -f code/{,*}/*.pyc data/*.html # Remove unecessary files
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r code data ${PN}.py || die "doins failed"
-	if use music ; then
-		doins -r ../${MUSIC}/music || die "doins failed"
-	fi
-	# uses python-2 style exceptions
-	games_make_wrapper ${PN} "python2 ${PN}.py" "${GAMES_DATADIR}/${PN}"
-	dodoc README.txt TODO Changelog AUTHORS
-	prepgamesdirs
-}
diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
index a4a986a6fdd8..d1defc2be57a 100644
--- a/games-sports/torcs/Manifest
+++ b/games-sports/torcs/Manifest
@@ -1,2 +1 @@
-DIST torcs-1.3.4.tar.bz2 414704098 SHA256 be50a42e4a32b322411a786ce4ab2fed44a1a2431511aef9925017858168e485 SHA512 8998ebaa92cb9d6c45cef5743b0cf6da04d88bb3eea18c863c4b3542eaff4b4c09cf47755dd47f5103fe4c0701125c8492cf6220bec97f1825e8cc549aa8270e WHIRLPOOL a73f3b8c4334d0d6795e1053d6131de84d2179cfc2451abf27bff05f57fdc5281deffae4a1f4c48333846e4aaaee7a5a1f6965cc353ba3b718327e494dae757a
 DIST torcs-1.3.6.tar.bz2 477954437 SHA256 193cb1820170eb18335dffeaa345499229a4b7972a78acbfaca197597a3075af SHA512 4116c920b92ecbf5dcd3f14a137e86685651167f68725f2ad4549b2d3d20e3dc54569685925e08ffff6e7e19e532ecb1a95ec77dfe22a542a26c9e006b0c8c0d WHIRLPOOL 41579dc91f3df9950a9808d7c858f736b0218a781bf8565914097edca4ba2918ea6f5434335f5f6fae488d391bbce2f7c68be613fbd95825575497d093124f10
diff --git a/games-sports/torcs/files/torcs-1.3.4-as-needed.patch b/games-sports/torcs/files/torcs-1.3.4-as-needed.patch
deleted file mode 100644
index d94eb8e061c0..000000000000
--- a/games-sports/torcs/files/torcs-1.3.4-as-needed.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- torcs-1.3.4/configure.in
-+++ torcs-1.3.4/configure.in
-@@ -123,11 +123,10 @@
- AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
--AC_CHECK_LIB(openal, alEnable, LDFLAGS="$LDFLAGS -lopenal", AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
-+AC_CHECK_LIB(openal, alEnable, LIBS="$LIBS -lopenal", AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
- AC_CHECK_LIB(alut, alutLoadWAVFile,
--	LDFLAGS="$LDFLAGS -lalut",
--	LDFLAGS="$LDFLAGS")
--AC_CHECK_LIB(vorbisfile, ov_fopen, LDFLAGS="$LDFLAGS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.]))
-+	LIBS="$LIBS -lalut", )
-+AC_CHECK_LIB(vorbisfile, ov_fopen, LIBS="$LIBS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.]))
- 
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
---- torcs-1.3.4/Make-default.mk
-+++ torcs-1.3.4/Make-default.mk
-@@ -402,7 +402,7 @@
- ifdef PROGRAM
- 
- ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installprogram: ${PROGRAM}
- 	@ createdir="${INSTLIBBASE}" ; \
-@@ -420,14 +420,14 @@
- ifdef LOCALTOOLS
- 
- ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- endif
- 
- ifdef TOOLS
- 
- ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installtools: ${TOOLS}
- 	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \
-@@ -478,7 +478,7 @@
- ifdef SOLIBRARY
- 
- ${SOLIBRARY}: ${OBJECTS}
--	${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS}
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/lib" ; \
- 	$(mkinstalldirs) $$createdir ; \
-@@ -509,7 +509,7 @@
- ifdef MODULE
- 
- ${MODULE}: ${OBJECTS}
--	${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} 
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} 
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/${MODULEDIR}" ; \
- 	$(mkinstalldirs) $$createdir ; \
---- torcs-1.3.4/src/libs/client/Makefile
-+++ torcs-1.3.4/src/libs/client/Makefile
-@@ -23,6 +23,8 @@
- SOURCES   = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
- 	    optionmenu.cpp
- 
-+SOLIBS    = -lconfscreens -lraceengine
-+
- LIBS      =  -lplibssg -lplibsg -lplibul
- 
- EXPDIR    = include
---- torcs-1.3.4/src/libs/Makefile
-+++ torcs-1.3.4/src/libs/Makefile
-@@ -23,7 +23,7 @@
- 
- TOOLSUBDIRS	= txml
- 
--SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \
-+SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
- 			  portability math musicplayer
- 
- PKGSUBDIRS	= $(SUBDIRS)
---- torcs-1.3.4/src/libs/raceengineclient/Makefile
-+++ torcs-1.3.4/src/libs/raceengineclient/Makefile
-@@ -23,6 +23,8 @@
- SOURCES      = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \
- 	       raceengine.cpp raceresults.cpp
- 
-+SOLIBS       = -lconfscreens -lrobottools -lracescreens
-+
- EXPDIR       = include
- 
- EXPORTS      = singleplayer.h raceinit.h
---- torcs-1.3.4/src/libs/tgf/Makefile
-+++ torcs-1.3.4/src/libs/tgf/Makefile
-@@ -29,6 +29,7 @@
- 		profiler.cpp \
- 		hash.cpp
- 
-+SOLIBS  = -ltxml
- 
- EXPDIR  = include
- 
diff --git a/games-sports/torcs/files/torcs-1.3.4-flags.patch b/games-sports/torcs/files/torcs-1.3.4-flags.patch
deleted file mode 100644
index 170303804da2..000000000000
--- a/games-sports/torcs/files/torcs-1.3.4-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-respect cflags
-
---- torcs-1.3.4/configure.in
-+++ torcs-1.3.4/configure.in
-@@ -50,8 +50,7 @@
- ADDCFLAGS="-Wall -fPIC -fno-strict-aliasing"
- AC_ARG_ENABLE(debug,
- 	[  --enable-debug          set the debug mode],
--	ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT",
--	ADDCFLAGS="$ADDCFLAGS -O2")
-+	ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT")
- 
- AC_ARG_ENABLE(xrandr,
- 	[  --disable-xrandr	   reset the XRANDR mode],
diff --git a/games-sports/torcs/files/torcs-1.3.4-no-automake.patch b/games-sports/torcs/files/torcs-1.3.4-no-automake.patch
deleted file mode 100644
index 7f0a921b1760..000000000000
--- a/games-sports/torcs/files/torcs-1.3.4-no-automake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-torcs doesn't use automake, so it shouldn't be calling the macro
-
-http://bugs.gentoo.org/408473
-
---- torcs-1.3.4/configure.in
-+++ torcs-1.3.4/configure.in
-@@ -15,9 +15,12 @@
- #
- ##############################################################################
- 
--AC_INIT(Make-config.in)
-+AC_INIT(torcs, 1.3.4)
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE(torcs, 1.3.4)
-+dnl Workaround code using old VERSION instead of new PACKAGE_VERSION
-+VERSION=$PACKAGE_VERSION
-+AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [old VERSION workaround])
-+AC_SUBST(VERSION)
- 
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch b/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch
deleted file mode 100644
index 6f4a2e406223..000000000000
--- a/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.in.old
-+++ configure.in
-@@ -116,12 +116,8 @@
- AC_CHECK_LIB(ICE, IceSetIOErrorHandler,,AC_MSG_ERROR([Can't find libICE. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- dnl Replace `main' with a function in -lSM:
- AC_CHECK_LIB(SM, SmsSetErrorHandler,,AC_MSG_ERROR([Can't find libSM. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
--dnl Replace `main' with a function in -lXt:
--AC_CHECK_LIB(Xt, XtDisplay,,AC_MSG_ERROR([Can't find libXt. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- dnl Replace `main' with a function in -lXi:
- AC_CHECK_LIB(Xi, XOpenDevice,,AC_MSG_ERROR([Can't find libXi. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
--dnl Replace `main' with a function in -lXmu:
--AC_CHECK_LIB(Xmu, XmuSimpleErrorHandler,,AC_MSG_ERROR([Can't find libXmu. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
diff --git a/games-sports/torcs/torcs-1.3.4.ebuild b/games-sports/torcs/torcs-1.3.4.ebuild
deleted file mode 100644
index d04079f79d6d..000000000000
--- a/games-sports/torcs/torcs-1.3.4.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/games-sports/torcs/torcs-1.3.4.ebuild,v 1.4 2014/07/19 13:55:10 tupone Exp $
-
-EAPI=5
-inherit autotools eutils multilib games
-
-DESCRIPTION="The Open Racing Car Simulator"
-HOMEPAGE="http://torcs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2"
-
-LICENSE="GPL-2 FreeArt"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/freealut
-	media-libs/freeglut
-	media-libs/libpng:0
-	media-libs/libvorbis
-	media-libs/openal
-	>=media-libs/plib-1.8.4
-	sys-libs/zlib
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-no-automake.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-noXmuXt.patch
-	eautoreconf
-	ecvs_clean
-}
-
-src_configure() {
-	addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g')
-	[[ -e /dev/dsp ]] && addpredict /dev/dsp
-	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}" \
-		--x-libraries=/usr/$(get_libdir) \
-		--enable-xrandr
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install datainstall
-	newicon Ticon.png ${PN}.png
-	make_desktop_entry ${PN} TORCS
-	dodoc README doc/history/history.txt
-	doman doc/man/*.6
-	dohtml -r doc/faq/faq.html doc/tutorials doc/userman
-	prepgamesdirs
-}
diff --git a/games-sports/vdrift/Manifest b/games-sports/vdrift/Manifest
index eadc1d7dc48a..81706fcbebc0 100644
--- a/games-sports/vdrift/Manifest
+++ b/games-sports/vdrift/Manifest
@@ -1,3 +1,2 @@
-DIST vdrift-2011-10-22.tar.bz2 591243241 SHA256 1a0dff7aa003276c0984d34f329e619bb2e7b4b07d9a21a6b17449904ad8e16d SHA512 de036f97e0f24af2602765801aff2057ce5b6398b93927655417fafcc37b7e03b809681765a10edba8edd532c0b6dbba12538021721a4f411708d3717d0736b8 WHIRLPOOL 29fc955f600256296b99f906d7de52feebf1efa0afc4b089d784f079c627da93cbde3ad22dbe8b2a87dd514915d8bc69c5060c3d8aac15b7025c880ac07cc703
 DIST vdrift-2012-07-22.tar.bz2 589288618 SHA256 5409feea1d9eb3d943f49ecc265b73f3283a00036e055038f5e5114dfc6113fb SHA512 eb6f243fd28e5fe46e856c37cb528c8ec903bdec91b6aa86681add79a333077a3a8874f694255913ae8492b965884f02057a95a98e37027ff67c082a8ca5527e WHIRLPOOL 7488cbc64b1fefca9d16267a623afd08b1fb2bd02af13b0c12cdbc9a2cc18f8965a796b2d8222e85826a277aaf17d8f9adda4e2b9621e6b7779fcb3546f140dd
 DIST vdrift-2012-07-22c_patch.diff 21689 SHA256 3e669ac2ce6da04548bb53b63694d21fd83cd8971e3f268031d7ffd93b79ae22 SHA512 7b82ba53f3c19ccd01de9ea64e0b7e15224219c0c614a6505b2a3f552ce78565fdedf7781a198c58606d3e9b94e594dee79097d46687e7d4fc763868204b761d WHIRLPOOL f24a7acb58d711d6bf4cda04ff4be1990c241399effdc821ecc8330bfd04a9067a048a840db9be7cabd1c6ca1b7051b003d548b87b2a1bb7d5000afdeb4e0a03
diff --git a/games-sports/vdrift/files/vdrift-20111022-build.patch b/games-sports/vdrift/files/vdrift-20111022-build.patch
deleted file mode 100644
index 6384910faadd..000000000000
--- a/games-sports/vdrift/files/vdrift-20111022-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- SConstruct
-+++ SConstruct
-@@ -138,6 +139,7 @@
-         LINKFLAGS = ['-pthread'],
-         CC = 'gcc', CXX = 'g++',
-         options = opts)
-+    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-     check_headers = ['asio.hpp', 'boost/bind.hpp', 'GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h', 'curl/curl.h', 'bullet/btBulletCollisionCommon.h', 'archive.h']
-     check_libs = [ ['GLEW', 'GL/glew.h', 'glDeleteSamplers(0, NULL);', 'Your GLEW library is out of date.'] ]
- 
-@@ -390,7 +392,7 @@
- if env['release']:
-     # release build, debugging off, optimizations on
-     if (sys.platform != 'freebsd6') and (sys.platform != 'freebsd7') and (sys.platform != 'freebsd8') and (sys.platform != 'freebsd9') and (sys.platform != 'win32') and (sys.platform != 'cygwin'):
--        env.Append(CCFLAGS = ['-O1', '-pipe'])
-+        env.Append(CCFLAGS = ['-pipe'])
- else:
-     # debug build, lots of debugging, no optimizations
-     env.Append(CCFLAGS = ['-g3'])
-@@ -409,7 +411,6 @@
-     env.Append(CCFLAGS = ['-pg'])
-     env.Append(LINKFLAGS = ['-pg'])
-     env.Append(CCFLAGS = ['-g3'])
--    env.Append(CCFLAGS = ['-O1'])
- 
- #------------------------------------#
- # compile-time efficiency assessment #
diff --git a/games-sports/vdrift/files/vdrift-20111022-bullet282.patch b/games-sports/vdrift/files/vdrift-20111022-bullet282.patch
deleted file mode 100644
index a16dd42f8365..000000000000
--- a/games-sports/vdrift/files/vdrift-20111022-bullet282.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dynamicsworld.cpp.old	2014-05-15 13:23:06.584092773 +0200
-+++ src/dynamicsworld.cpp	2014-05-15 13:23:13.748948512 +0200
-@@ -101,7 +101,7 @@
- 	int patch_id = -1;
- 	const BEZIER * b = 0;
- 	const TRACKSURFACE * s = TRACKSURFACE::None();
--	btCollisionObject * c = 0;
-+	const btCollisionObject * c = 0;
- 
- 	MyRayResultCallback ray(origin, p, caster);
- 	rayTest(origin, p, ray);
diff --git a/games-sports/vdrift/vdrift-20111022.ebuild b/games-sports/vdrift/vdrift-20111022.ebuild
deleted file mode 100644
index 0e320dca0f50..000000000000
--- a/games-sports/vdrift/vdrift-20111022.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/vdrift/vdrift-20111022.ebuild,v 1.6 2014/05/15 11:46:29 tupone Exp $
-
-EAPI=2
-inherit eutils scons-utils games
-
-MY_P=${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="A driving simulation made with drift racing in mind"
-HOMEPAGE="http://vdrift.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-arch/libarchive
-	media-libs/glew
-	media-libs/libsdl[opengl,video]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/libvorbis
-	net-misc/curl
-	sci-physics/bullet[-double-precision]
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	dev-cpp/asio
-	dev-libs/boost
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-bullet282.patch
-}
-
-src_compile() {
-	escons \
-		force_feedback=1 \
-		destdir="${D}" \
-		bindir="${GAMES_BINDIR}" \
-		datadir="${GAMES_DATADIR}"/${PN} \
-		prefix= \
-		use_binreloc=0 \
-		release=1 \
-		os_cc=1 \
-		os_cxx=1 \
-		os_cxxflags=1 \
-		|| die
-}
-
-src_install() {
-	dogamesbin build/vdrift || die
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data/* || die
-	newicon data/textures/icons/vdrift-64x64.png ${PN}.png
-	make_desktop_entry ${PN} VDrift
-	find "${D}" -name "SCon*" -exec rm \{\} +
-	cd "${D}"
-	keepdir $(find "${GAMES_DATADIR/\//}/${PN}" -type d -empty)
-	prepgamesdirs
-}
diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
index 50f7fe1743d7..5d12045024a9 100644
--- a/games-strategy/asc/Manifest
+++ b/games-strategy/asc/Manifest
@@ -1,4 +1,3 @@
-DIST asc-2.5.0.0.tar.bz2 42084514 SHA256 ad6edb629049bda615b7c9b3046ab33d35dbc25de39a5ed15b9279fe48f779c6 SHA512 ee1ed1e8fdd0050b016f8cf51d6e3a00a5c3c4d6e5da25fb8ccf136a15ba03ab97a9734e634028cc12330eabd63a275afc825317e2adbe260df23101b4f49881 WHIRLPOOL 48680ddbad7609a460bd083992476b5c4c52d2140c456b9aa567387b7f4431dacdbf619886c1b1ea9ac1f350ce6e248c6a0024e0d9987c6f67b60590a5929380
 DIST asc-2.6.0.0.tar.bz2 42280527 SHA256 e59caa549dc8d8a321211f60652cc809cbbf37d000ee85af790e676d9656cbbb SHA512 e1dea48bf87424fd65772e6d9bad96cf63e4062df5717bbc925562683782afc2d9788ea28e7147d905c3c0f6db3ef7c102a59022988c9fcf8aa6adba91dc5540 WHIRLPOOL 1662259bb1ab1c6f31b8ba227a7ac757f2a89ba4caacd9f2f5f3f737f60c31096f247cbc72eca61e572edce9ba4baeae6d5320e748a1415acc4ee0663f9db3b5
 DIST frontiers.ogg 4691844 SHA256 eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af WHIRLPOOL a48a6596421a7a5b2d663af14e12c04db2a47c3bde8f1cc54dfe72c69b095613e6479eb408483679979f264d848911b34ee7edb56757734229d1990046bcdd5b
 DIST machine_wars.ogg 3138308 SHA256 bd7f330c06090d98e5ba0dac5a691af1804ba383b783b7b2f960bc2e53400a77 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8 WHIRLPOOL 7a83910d48414ffe3687374efb661dd169801f244857a4f154d400b76477917bfa2db63dfddfc57544be95e413cf23e810b346f3a39d4f140454237b235a2eee
diff --git a/games-strategy/asc/asc-2.5.0.0.ebuild b/games-strategy/asc/asc-2.5.0.0.ebuild
deleted file mode 100644
index 89225d37e5eb..000000000000
--- a/games-strategy/asc/asc-2.5.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v 1.4 2012/10/30 15:07:24 tupone Exp $
-
-EAPI=4
-WX_GTK_VER=2.8
-inherit eutils toolchain-funcs flag-o-matic wxwidgets games
-
-DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
-HOMEPAGE="http://www.asc-hq.org/"
-SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2
-	http://www.asc-hq.org/music/frontiers.ogg
-	http://www.asc-hq.org/music/time_to_strike.ogg
-	http://www.asc-hq.org/music/machine_wars.ogg"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	media-libs/libsdl
-	media-libs/libpng
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-sound
-	dev-libs/boost
-	dev-games/physfs
-	media-libs/xvid
-	dev-libs/expat
-	media-libs/freetype
-	dev-lang/lua
-	x11-libs/wxGTK:2.8[X]
-	dev-libs/libsigc++:1.2"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	app-arch/zip"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
-
-src_unpack() {
-	local f
-
-	unpack ${P}.tar.bz2
-	for f in ${A}
-	do
-		case ${f} in
-		*ogg)
-			cp "${DISTDIR}/${f}" "${S}/data/music" || die "cp music failed"
-			;;
-		esac
-	done
-}
-
-src_configure() {
-	# Added --disable-paraguitest for bugs 26402 and 4488
-	# Added --disable-paragui for bug 61154 since it's not really used much
-	# and the case is well documented at http://www.asc-hq.org/
-	if [[ $(gcc-major-version) -eq 4 ]] ; then
-		replace-flags -O3 -O2
-	fi
-	egamesconf \
-		--disable-paraguitest \
-		--disable-paragui \
-		--datadir="${GAMES_DATADIR_BASE}"
-}
-
-src_install() {
-	default
-	dohtml -r doc/*
-	prepgamesdirs
-}
diff --git a/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch b/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch
deleted file mode 100644
index b6541075ea4b..000000000000
--- a/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- source/graphics/drawing.h.old	2012-10-30 10:33:47.617844756 +0100
-+++ source/graphics/drawing.h	2012-10-30 10:46:23.444784874 +0100
-@@ -169,7 +169,7 @@
-          PixelType* pix = (PixelType*)( surf.pixels() );
-          pix += pos.y * surf.pitch()/pixelsize + pos.x;
- 
--         assign ( src, pix );
-+         this->assign ( src, pix );
-       };
- };
- 
---- source/graphics/blitter.h.old	2012-10-30 12:21:14.767021349 +0100
-+++ source/graphics/blitter.h	2012-10-30 12:22:18.492472029 +0100
-@@ -928,6 +928,7 @@
-       ;
- };
- 
-+#include "drawing.h"
- 
- 
- extern const int ColorMerger_Alpha_XLAT_Table_shadings[8]; 
---- source/itemrepository.cpp.old	2012-10-30 10:32:06.771697823 +0100
-+++ source/itemrepository.cpp	2012-10-30 12:23:42.973448933 +0100
-@@ -88,7 +88,7 @@
-    t->filename = fileName;
-    t->location = location;
-    t->archive = prc.getArchive();
--   add ( t );
-+   this->add ( t );
- }
- 
- 
-@@ -110,7 +110,7 @@
-       t->archive = stream.readString();
-       dataLoaderTicker();
- 
--      add ( t );
-+      this->add ( t );
-       // add ( T::newFromStream(stream ));
-    }
- }
diff --git a/games-strategy/dark-oberon/Manifest b/games-strategy/dark-oberon/Manifest
index 6c7d27a18143..ed954ee0c00a 100644
--- a/games-strategy/dark-oberon/Manifest
+++ b/games-strategy/dark-oberon/Manifest
@@ -1 +1 @@
-DIST dark-oberon-1.0.2-RC1.tar.gz 28487655 RMD160 078de205c884ff1255b9600c9a763d526fed066d SHA1 1708a1e6ed762c674bd7aa3296d3d28e297bc589 SHA256 d867bac1f75c844a005d1f873059090d25f9f266730fcd7d0d261a5b84a420b1
+DIST dark-oberon-1.0.2-RC1.tar.gz 28487655 SHA256 d867bac1f75c844a005d1f873059090d25f9f266730fcd7d0d261a5b84a420b1 SHA512 657f0403f2ea638cd5dc0c3342d3e1c967223edc7f45276c2f2df1733101effb0e994b87f5ad26dd654edcc57d3718ea65848e62087b5cd6f036d5d478d55232 WHIRLPOOL 17a0f91e27f3205fec55845d1c865ad44f1abb863f75bd3c91b9a9fcb0fb7d6441fa01b1b5c0ac1f7e2828997be3b0dc1f1463da4f4a2caf435a374f7ccdb4d1
diff --git a/games-strategy/dark-oberon/dark-oberon-1.0.2_rc1.ebuild b/games-strategy/dark-oberon/dark-oberon-1.0.2_rc1.ebuild
index 0d453dd4509f..1ac402791ca6 100644
--- a/games-strategy/dark-oberon/dark-oberon-1.0.2_rc1.ebuild
+++ b/games-strategy/dark-oberon/dark-oberon-1.0.2_rc1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dark-oberon/dark-oberon-1.0.2_rc1.ebuild,v 1.4 2010/09/16 12:20:32 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dark-oberon/dark-oberon-1.0.2_rc1.ebuild,v 1.5 2015/02/18 19:11:30 mr_bones_ Exp $
 
-EAPI=2
-inherit games
+EAPI=5
+inherit eutils games
 
 MY_PV=${PV/_rc/-RC}
 MY_P=${PN}-${MY_PV}
@@ -25,21 +25,25 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${P}"-gcc41.patch
-	"${FILESDIR}/${P}"-gentoo.patch
-	"${FILESDIR}"/${P}-ldflags.patch
 )
 
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-gentoo.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+}
+
 src_compile() {
-	emake -C src $(use fmod && echo "SOUND=1") ../${PN} || die "emake failed"
+	emake -C src $(use fmod && echo "SOUND=1") ../${PN}
 }
 
 src_install() {
-	dogamesbin dark-oberon || die "dogamesbin failed"
+	dogamesbin dark-oberon
 
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r dat maps races schemes || die "doins failed"
-	dodoc README docs/* || die "dodoc failed"
+	doins -r dat maps races schemes
+	dodoc README docs/*
 
 	prepgamesdirs
 }
diff --git a/games-strategy/freecol/freecol-0.10.7.ebuild b/games-strategy/freecol/freecol-0.10.7.ebuild
index 77fe915e6efe..cb0150800c54 100644
--- a/games-strategy/freecol/freecol-0.10.7.ebuild
+++ b/games-strategy/freecol/freecol-0.10.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.7.ebuild,v 1.1 2013/02/05 00:20:46 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.7.ebuild,v 1.2 2015/02/19 09:07:18 ago Exp $
 
 EAPI=5
 inherit base eutils java-pkg-2 java-ant-2 games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jsr173
diff --git a/games-strategy/freesynd/freesynd-0.7.1.ebuild b/games-strategy/freesynd/freesynd-0.7.1.ebuild
index e546c8079ebb..dc25e620a78c 100644
--- a/games-strategy/freesynd/freesynd-0.7.1.ebuild
+++ b/games-strategy/freesynd/freesynd-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freesynd/freesynd-0.7.1.ebuild,v 1.3 2015/02/18 09:56:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freesynd/freesynd-0.7.1.ebuild,v 1.4 2015/02/19 10:40:32 ago Exp $
 
 EAPI=5
 inherit eutils cmake-utils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug devtools"
 
 RDEPEND="media-libs/libogg
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index b5bbaae39c4a..24598d8e2942 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,3 +1,2 @@
-DIST lgeneral-1.2.3.tar.gz 1630400 SHA256 55d17bb173c956c705b94bc8a6399d5311b3ec82c9f1821a97fe9ec45da0d9a1 SHA512 f6481d39e29e112b40bf4fce0edae4ad0228a31eea14aec3f8504ebb1878212e4c82b13a77ff09939f0f41903cb8f915ebfd005ab9e3f7b821d4ca3ddef5ec15 WHIRLPOOL f58182f1327667f2254c65000f79f97e247e42d431078bd4aa0ca76c24699ef5486ba3033faf84eb0a043daafcbf882fd3ceb56427847e5ac1f7567b679cda59
 DIST lgeneral-1.2.4.tar.gz 1677195 SHA256 7207cba927f518b5962a4c5b709a8aca128fd0638c47984e9da0415ad2610c00 SHA512 c85cc6454b30d0ac84a2a4e0e35b9cca8b4ab3f8816f9bac607a439dde5eb667432596c09af3e5f1382572860eab4291dcbe045af7eef59cf879a4e9db9506cd WHIRLPOOL e25e7cb0ed6fabf408773a8aedb0e79ade10390f874d7c08a3624b273166a718630587afcde88ca0a9664e8634a0656c69e7aa5f9f708125cc1f381a12add7cd
 DIST pg-data.tar.gz 410454 SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516 WHIRLPOOL 69f22f28cf4639dab0e6cf90036c26178129d7f67decf8b95ca175bb224bb3b985cf80382e06e45db06ef21d9ab9819fc1821b3d633a67bbb06ba56a8b450022
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch b/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch
deleted file mode 100644
index 364b65a7ee3c..000000000000
--- a/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- lgc-pg/units.c.old	2014-10-20 08:42:12.389153753 +0200
-+++ lgc-pg/units.c	2014-10-20 08:42:41.412883009 +0200
-@@ -552,7 +552,7 @@
-             }
-         }
-         /* get flags */
--        sprintf( flags, unit_classes[entry.class * 3 + 2] );
-+        sprintf( flags, "%s", unit_classes[entry.class * 3 + 2] );
-         if ( apply_unit_mods ) {
-             i = 0;
-             while ( add_flags[i*2][0] != 'X' ) {
---- src/engine.c.old	2014-10-20 08:44:21.867947804 +0200
-+++ src/engine.c	2014-10-20 08:45:19.299413602 +0200
-@@ -2311,7 +2311,7 @@
-                 if ( gui->module_dlg->subdir[0] != 0 )
-                     sprintf( path, "%s/%s", gui->module_dlg->subdir, (char*)gui->module_dlg->lbox->cur_item );
-                 else
--                    sprintf( path, (char*)gui->module_dlg->lbox->cur_item );
-+                    sprintf( path, "%s", (char*)gui->module_dlg->lbox->cur_item );
-                 free( setup.modules[gui->setup->sel_id] );
-                 setup.modules[gui->setup->sel_id] = strdup( path );
-                 gui_handle_player_select( gui->setup->list->cur_item );
-@@ -2756,7 +2756,7 @@
-                      result = gui_get_message_pane_selection(camp_pane);
-                      if (result && strcmp(result, "nextscen") == 0) {
-                          /* start scenario */
--                         sprintf( setup.fname, camp_cur_scen->scen );
-+                         sprintf( setup.fname, "%s", camp_cur_scen->scen );
-                          setup.type = SETUP_DEFAULT_SCEN;
-                          end_scen = 1;
-                          *reinit = 1;
-@@ -4243,7 +4243,7 @@
-                 }
-                 else {
-                     /* next scenario */
--                    sprintf( setup.fname, camp_cur_scen->scen );
-+                    sprintf( setup.fname, "%s", camp_cur_scen->scen );
-                     setup.type = SETUP_CAMP_BRIEFING;
-                     reinit = 1;
-                 }
diff --git a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild b/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
deleted file mode 100644
index 00bfc1c366b3..000000000000
--- a/games-strategy/lgeneral/lgeneral-1.2.3.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/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v 1.6 2014/10/20 07:00:23 tupone Exp $
-
-EAPI=5
-inherit eutils autotools games
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/beta-}"
-DESCRIPTION="A Panzer General clone written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LGeneral"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mirror://sourceforge/${PN}/pg-data.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format.patch
-	sed -i \
-		-e '/desktop_DATA/d' \
-		-e '/icon_DATA/d' \
-		Makefile.am || die
-
-	cp /usr/share/gettext/config.rpath .
-	rm -f missing
-	eautoreconf
-
-	# Build a temporary lgc-pg that knows about ${WORKDIR}:
-	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die "cp failed"
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
-		-e "s:@D@::" \
-		{lgc-pg,src}/misc.c \
-		|| die "sed failed"
-
-	cd "${WORKDIR}"/tmp-build
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
-		-e "s:@D@:${D}:" \
-		{lgc-pg,src}/misc.c \
-		|| die "sed failed (tmp)"
-}
-
-src_configure() {
-	egamesconf \
-		$(use_enable nls)
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build
-	egamesconf \
-		--disable-nls \
-		--datadir="${D}/${GAMES_DATADIR}"
-}
-
-src_compile() {
-	emake
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build
-	emake
-}
-
-src_install() {
-	default
-	keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain}
-
-	# Generate scenario data:
-	dodir "${GAMES_DATADIR}"/${PN}/gfx/{flags,units,terrain} #413901
-	SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg \
-		-s "${WORKDIR}"/pg-data \
-		-d "${D}/${GAMES_DATADIR}"/${PN} \
-		|| die "Failed to generate scenario data"
-
-	newicon lgeneral48.png ${PN}.png
-	make_desktop_entry ${PN} LGeneral
-	prepgamesdirs
-}
diff --git a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild b/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
index 3db25e94b3ce..23c987251822 100644
--- a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
+++ b/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
@@ -1,70 +1,67 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8.2.ebuild,v 1.10 2012/10/16 12:21:34 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8.2.ebuild,v 1.11 2015/02/18 19:08:13 mr_bones_ Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils games
 
 DATAVERSION="0.8"
 DESCRIPTION="Fast-action multiplayer strategic network game"
-HOMEPAGE="http://netpanzer.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2
-	mirror://berlios/${PN}/${PN}-data-${DATAVERSION}.tar.bz2"
+HOMEPAGE="http://www.netpanzer.info/"
+SRC_URI="mirror://sourceforge/netpanzer.berlios/${P}.tar.bz2
+	mirror://sourceforge/netpanzer.berlios/${PN}-data-${DATAVERSION}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="ppc x86"
 IUSE="dedicated"
 
 RDEPEND="dedicated? ( app-misc/screen )
-	media-libs/libsdl
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
 	media-libs/sdl-image
 	dev-games/physfs"
 DEPEND="${RDEPEND}
 	dev-util/ftjam"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-)
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+}
 
 src_configure() {
-	egamesconf || die
+	egamesconf
 	cd "${WORKDIR}"/${PN}-data-${DATAVERSION} \
-		&& egamesconf || die
+		&& egamesconf
 }
 
 src_compile() {
-	AR="${AR} cru" jam -q || die "jam failed"
+	AR="${AR} cru" jam -q || die
 
 	cd "${WORKDIR}"/${PN}-data-${DATAVERSION}
-	jam -q || die "jam failed (on data package)"
+	jam -q || die
 }
 
 src_install() {
-	jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install \
-		|| die "jam install failed"
+	jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install || die
 
 	cd "${WORKDIR}"/${PN}-data-${DATAVERSION}
-	jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install \
-		|| die "jam install failed (data package)"
+	jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install || die
 
 	if use dedicated ; then
 		newinitd "${FILESDIR}"/${PN}.rc ${PN}
 		sed -i \
 			-e "s:GAMES_USER_DED:${GAMES_USER_DED}:" \
 			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
-			"${D}"/etc/init.d/${PN} \
-			|| die "sed failed"
+			"${D}"/etc/init.d/${PN} || die
 
 		insinto /etc
 		doins "${FILESDIR}"/${PN}-ded.ini
 		dogamesbin "${FILESDIR}"/${PN}-ded
 		sed -i \
 			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
-			"${D}/${GAMES_BINDIR}"/${PN}-ded \
-			|| die "sed failed"
+			"${D}/${GAMES_BINDIR}"/${PN}-ded || die
 	fi
 
 	rm -rf "${D}/${GAMES_DATADIR}"/{applications,pixmaps}
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
index 3c678dd8f6ca..31536de68cb6 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/s25rttr/s25rttr-0.8.1.ebuild,v 1.2 2014/05/15 17:06:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/s25rttr/s25rttr-0.8.1.ebuild,v 1.3 2015/02/19 10:40:52 ago Exp $
 
 EAPI=5
 inherit eutils cmake-utils gnome2-utils games
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug glfw"
 
 RDEPEND="app-arch/bzip2
diff --git a/games-strategy/uqm/uqm-0.7.0-r2.ebuild b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
index 099434fa1e69..0fc520c0a8d6 100644
--- a/games-strategy/uqm/uqm-0.7.0-r2.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.7.0-r2.ebuild,v 1.6 2014/05/15 17:07:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.7.0-r2.ebuild,v 1.7 2015/02/19 09:29:18 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils multilib toolchain-funcs games
 
 DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
@@ -51,54 +51,50 @@ src_prepare() {
 
 	# Take out the read so we can be non-interactive.
 	sed -i \
-		-e '/read CHOICE/d' build/unix/menu_functions \
-		|| die "sed menu_functions failed"
+		-e '/read CHOICE/d' build/unix/menu_functions || die
 
 	# respect CFLAGS
 	sed -i \
-		-e "s/-O3//" build/unix/build.config \
-		|| die "sed build.config failed"
+		-e "s/-O3//" build/unix/build.config || die
 
 	sed -i \
-		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" build/unix/uqm-wrapper.in \
-		|| die "sed uqm-wrapper.in failed"
+		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
+		build/unix/uqm-wrapper.in || die
 
 	# respect CC
 	sed -i \
 		-e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
-		build/unix/config_proginfo_build \
-		|| die "sed config_proginfo_build failed"
+		build/unix/config_proginfo_build || die
 }
 
 src_compile() {
-	MAKE_VERBOSE=1 ./build.sh uqm || die "build failed"
+	MAKE_VERBOSE=1 ./build.sh uqm || die
 }
 
 src_install() {
 	# Using the included install scripts seems quite painful.
 	# This manual install is totally fragile but maybe they'll
 	# use a sane build system for the next release.
-	newgamesbin uqm-wrapper uqm || die "newgamesbin failed"
+	newgamesbin uqm-wrapper uqm
 	exeinto "$(games_get_libdir)"/${PN}
-	doexe uqm || die "doexe failed"
+	doexe uqm
 
 	insinto "${GAMES_DATADIR}"/${PN}/content/packages
-	doins "${DISTDIR}"/${P}-content.uqm || die "doins failed"
-	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version \
-		|| die "creating version file failed"
+	doins "${DISTDIR}"/${P}-content.uqm
+	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version || die
 
 	insinto "${GAMES_DATADIR}"/${PN}/content/addons
 	if use music; then
-		doins "${DISTDIR}"/${P}-3domusic.uqm || die "doins failed"
+		doins "${DISTDIR}"/${P}-3domusic.uqm
 	fi
 
 	if use voice; then
-		doins "${DISTDIR}"/${P}-voice.uqm || die "doins failed"
+		doins "${DISTDIR}"/${P}-voice.uqm
 	fi
 
 	if use remix; then
 		insinto "${GAMES_DATADIR}"/${PN}/content/addons
-		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3}.uqm || die "doins failed"
+		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3}.uqm
 	fi
 
 	dodoc AUTHORS ChangeLog Contributing README WhatsNew doc/users/manual.txt
diff --git a/games-util/gslist/Manifest b/games-util/gslist/Manifest
index 3982ee410bfc..7a8c5715ad5c 100644
--- a/games-util/gslist/Manifest
+++ b/games-util/gslist/Manifest
@@ -1 +1 @@
-DIST gslist-0.8.8a.zip 2246693 RMD160 77cc34cd1358f77e8c60601c62a78aec3383e19b SHA1 1f27b40ebe2ec77feca44e8002f12019b7b15f76 SHA256 2af4c929225d26b0d45aadc28abbbe3d9c8eb2ebe0b1dbe83663a19273212644
+DIST gslist-0.8.8a.zip 2246693 SHA256 2af4c929225d26b0d45aadc28abbbe3d9c8eb2ebe0b1dbe83663a19273212644
diff --git a/games-util/gslist/gslist-0.8.8a.ebuild b/games-util/gslist/gslist-0.8.8a.ebuild
index 63312690fed6..69bb41b90019 100644
--- a/games-util/gslist/gslist-0.8.8a.ebuild
+++ b/games-util/gslist/gslist-0.8.8a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/gslist/gslist-0.8.8a.ebuild,v 1.3 2010/05/22 15:22:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/gslist/gslist-0.8.8a.ebuild,v 1.4 2015/02/19 10:06:50 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="A GameSpy server browser"
@@ -26,11 +26,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake SQL=0 $(use web || echo GSWEB=0) || die "emake failed"
+	emake SQL=0 $(use web || echo GSWEB=0)
 }
 
 src_install() {
-	dogamesbin ${PN} || die "dogamesbin failed"
+	dogamesbin ${PN}
 	dodoc ${PN}.txt
 	prepgamesdirs
 }
diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
index 195754ca286c..3ab6775931c6 100644
--- a/games-util/higan-purify/higan-purify-03.ebuild
+++ b/games-util/higan-purify/higan-purify-03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/higan-purify/higan-purify-03.ebuild,v 1.3 2014/07/17 00:47:06 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/higan-purify/higan-purify-03.ebuild,v 1.4 2015/02/19 09:07:28 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://higan.googlecode.com/files/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="qt4"
 
 RDEPEND="
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index efe10894fec2..c2ad1c837444 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,3 +1,2 @@
 DIST linuxconsoletools-1.4.4.tar.bz2 40867 SHA256 61ac023a6944c1bc1c3ac56b9c281a3148f4d63557a1e239523d4de638dac4a8 SHA512 ab2f15e26da3705cea35e26dda149f83d5792b0643aa8f684854be26d98a69943cfac3f07c8eac83485a289c9bdc7d41ad3af8990cec0a168b6b6e30381ee33a WHIRLPOOL 6347a4e2dbfb518da9f1ad9e3f7c45c59c49e64b4fe025927f26c7ddec52dad0507a58790a27f6d7077e1a314d5e812219d6132104720c4ea55205fc295a69d3
-DIST linuxconsoletools-1.4.7.tar.bz2 42698 SHA256 4493cfda044be8067517e03b15abc86a043c0fc00fee2fcd8070701c65adecf1 SHA512 7e2c08f9c2a5e4a996870913257c7bc7874101780c9656e0fa34d035f8c696717a0906bdbe0e8c7e9c8fe7fce65b9df8b09da7b1b894ede34aa8bcabffdd39bd WHIRLPOOL e66d72f9ae80391baa5178ed7869a86ed75b9c4a66f743dab72229777a3dacce46aa425e54309276735a5d243764c3e908b4d5001882ad8ebebf62fd9bc5bb9c
 DIST linuxconsoletools-1.4.8.tar.bz2 43964 SHA256 23c4ac595f608e25f472d947c4193233f763f37ae0cf6b48141d33443a4cee6a SHA512 ea3a0baa3f163e10a4c76f58977a96d91d91bddb1a75cea5195b0a631c11ca55e40730aaa0d1965404837595c4a7fd8b75c3dd7785fe0e47ee2c90021341f262 WHIRLPOOL c02960d5e171efef3739f440a903ae9b14bec8b6ab4de2181ea691aa78c870f81b291ac98e313d234778fb59c4be8e53242cb46db019f3dffdbd8f26ddcbb113
diff --git a/games-util/joystick/files/joystick-1.4.7-build.patch b/games-util/joystick/files/joystick-1.4.7-build.patch
deleted file mode 100644
index f888ccd18812..000000000000
--- a/games-util/joystick/files/joystick-1.4.7-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- linuxconsoletools-1.4.4.orig/docs/Makefile
-+++ linuxconsoletools-1.4.4/docs/Makefile
-@@ -20,13 +20,17 @@
- # 02110-1301 USA.
- 
- MANPAGES	= inputattach.1 jstest.1 jscal.1 fftest.1 \
--		  ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
-+		  ffset.1 ffcfstress.1 jscal-store.1 \
- 		  jscal-restore.1
- 
-+ifneq ($(USE_SDL),no)
-+MANPAGES += ffmvforce.1
-+endif
-+
- PREFIX          ?= /usr/local
- 
- install:
- 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
--	install $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
-+	install -m 644 $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
- 
- .PHONY: install
---- linuxconsoletools-1.4.4.orig/utils/Makefile
-+++ linuxconsoletools-1.4.4/utils/Makefile
-@@ -27,9 +27,13 @@
- 
- CFLAGS		?= -g -O2 -Wall
- 
--PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS	= inputattach jstest jscal fftest ffset \
- 		  ffcfstress jscal-restore jscal-store
- 
-+ifneq ($(USE_SDL),no)
-+PROGRAMS += ffmvforce
-+endif
-+
- PREFIX          ?= /usr/local
- 
- compile: $(PROGRAMS)
diff --git a/games-util/joystick/joystick-1.4.7.ebuild b/games-util/joystick/joystick-1.4.7.ebuild
deleted file mode 100644
index 0e13afc4745a..000000000000
--- a/games-util/joystick/joystick-1.4.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.7.ebuild,v 1.1 2014/07/16 01:19:15 mr_bones_ Exp $
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_P="linuxconsoletools-${PV}"
-DESCRIPTION="joystick testing utilities"
-HOMEPAGE="http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
-SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="sdl"
-
-DEPEND="sdl? ( media-libs/libsdl:0[video] )
-	!<x11-libs/tslib-1.0-r2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	export PREFIX=/usr
-	tc-export CC PKG_CONFIG
-	export USE_SDL=$(usex sdl)
-}
diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
index 40a252c4552f..37931683cbc6 100644
--- a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
+++ b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild,v 1.1 2013/02/17 22:58:06 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild,v 1.2 2015/02/19 09:06:52 ago Exp $
 
 EAPI=5
 if [[ "${PV}" == "9999" ]]; then
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	inherit toolchain-funcs
 	SRC_URI="http://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc ~x86"
 fi;
 
 DESCRIPTION="WBFS manager for Linux using GTK+"
diff --git a/games-util/loki_patch/Manifest b/games-util/loki_patch/Manifest
index d467629ca86c..85a01ebe9057 100644
--- a/games-util/loki_patch/Manifest
+++ b/games-util/loki_patch/Manifest
@@ -1,2 +1,2 @@
-DIST loki_patch-20091105.tar.bz2 331725 RMD160 d68d53baffd690d5b7fdfeeeca45f3edf027e52d SHA1 deaa48069e90b2e4401bc26f1ca114c5f1cd93c2 SHA256 0a46562a9902719a2876e042c2c23b6343f53c68af502928c108d7f5b7a9e573
-DIST loki_setupdb-20091105.tar.bz2 60725 RMD160 397315f91673275cabcedd88473018807544d178 SHA1 05c6eb536af08bbf155a08bcbadb6723ffda0774 SHA256 34c4c2079b70f47bb4b2f05411b07107ee0d17654bf1977b6bb7d8841a837bc2
+DIST loki_patch-20091105.tar.bz2 331725 SHA256 0a46562a9902719a2876e042c2c23b6343f53c68af502928c108d7f5b7a9e573 SHA512 9db40b1746ecf5603c09be3ddf01bf92cfc6b3d1c35ac7153751e1871840175c538af98c22f458658bcbebac65ccddccc1aee92a88300a243b8e68bda13ca323 WHIRLPOOL a3ba0d86fb818fcc7847bbdacbf56c5934c52c79845c445bb722f40ec33ea1c320d9cbdb9e016a5821967b0afe4a8df1b4178c7038911be40a515bae9ad09f01
+DIST loki_setupdb-20091105.tar.bz2 60725 SHA256 34c4c2079b70f47bb4b2f05411b07107ee0d17654bf1977b6bb7d8841a837bc2 SHA512 ba55b24a6e2b2b6268dec9df8ec0581d852461b5c07ca97a24ebee3e55fe5764dffbbcfdb6b18a80677f2fae1e7701df4fbca0f6af8ef8050c662f5a39daf25d WHIRLPOOL 989d63aeaee52eaff7c96cafb6deb53d77e95db805206a448283e64b522f5ab300a515d171d28436b1992137ef9d8bb42a16fed9247a67de68a1115e3e03cc1d
diff --git a/games-util/loki_patch/loki_patch-20091105.ebuild b/games-util/loki_patch/loki_patch-20091105.ebuild
index 60d3f3bafb3c..d16490f67228 100644
--- a/games-util/loki_patch/loki_patch-20091105.ebuild
+++ b/games-util/loki_patch/loki_patch-20091105.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/loki_patch/loki_patch-20091105.ebuild,v 1.4 2012/05/03 03:41:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/loki_patch/loki_patch-20091105.ebuild,v 1.5 2015/02/19 08:53:38 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Loki Software binary patch tool"
@@ -41,12 +41,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C loki_setupdb || die "emake loki_setupdb failed"
-	emake -C loki_patch || die "emake loki_patch failed"
+	emake -C loki_setupdb
+	emake -C loki_patch
 }
 
 src_install() {
 	cd ${PN}
-	dobin loki_patch make_patch || die "dobin failed"
+	dobin loki_patch make_patch
 	dodoc CHANGES NOTES README TODO
 }
diff --git a/games-util/lutris/lutris-0.3.6.1.ebuild b/games-util/lutris/lutris-0.3.6.1.ebuild
index 6ad361206db1..b79cc1568b2b 100644
--- a/games-util/lutris/lutris-0.3.6.1.ebuild
+++ b/games-util/lutris/lutris-0.3.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/lutris/lutris-0.3.6.1.ebuild,v 1.1 2014/11/07 13:32:03 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/lutris/lutris-0.3.6.1.ebuild,v 1.2 2015/02/19 09:06:32 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/lutris/lutris/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/games-util/wiiload/Manifest b/games-util/wiiload/Manifest
index bd57358a80a7..42c6bf4225c1 100644
--- a/games-util/wiiload/Manifest
+++ b/games-util/wiiload/Manifest
@@ -1 +1 @@
-DIST wiiload-0.5.tar.gz 5291 RMD160 f06431c3db87a8afbefddf6c68a8e059af18de1a SHA1 0c07980d7523af593b16bd545c4893d5d01ba6bb SHA256 49da2326b43d95a5414d2491ba5a28bd5b97fbafecb1f40b79319213460fa912
+DIST wiiload-0.5.tar.gz 5291 SHA256 49da2326b43d95a5414d2491ba5a28bd5b97fbafecb1f40b79319213460fa912 SHA512 2c13490e5034078fef658ca3f9743be04fd6c870e485aae7be21a80967f2d1f1075fee016bf7945b20004bc5d96d0b3244f8a997c4410299f1f6afca002360e4 WHIRLPOOL d89ce7eb15151924365f15bd8dff8a8c6198be52ca171be24fda91f39e47958e2f22e7a005959b6ee5199df8aef657af6632419fc928bb147f94369ea9b1e6bf
diff --git a/games-util/wiiload/wiiload-0.5.ebuild b/games-util/wiiload/wiiload-0.5.ebuild
index 4d00c91046f4..1c7ac882475e 100644
--- a/games-util/wiiload/wiiload-0.5.ebuild
+++ b/games-util/wiiload/wiiload-0.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/wiiload/wiiload-0.5.ebuild,v 1.3 2011/04/15 21:49:57 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/wiiload/wiiload-0.5.ebuild,v 1.4 2015/02/19 09:07:47 mr_bones_ Exp $
 
+EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="load homebrew apps over the network to your Wii"
@@ -18,5 +19,5 @@ src_compile() {
 }
 
 src_install() {
-	dobin wiiload || die
+	dobin wiiload
 }
diff --git a/kde-base/ark/ark-4.14.3.ebuild b/kde-base/ark/ark-4.14.3.ebuild
deleted file mode 100644
index c2f546481d12..000000000000
--- a/kde-base/ark/ark-4.14.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.14.3.ebuild,v 1.2 2014/12/11 12:40:28 zlogene Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE Archiving tool"
-HOMEPAGE="http://www.kde.org/applications/utilities/ark
-http://utils.kde.org/projects/ark"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+archive +bzip2 debug lzma"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-	sys-libs/zlib
-	archive? ( >=app-arch/libarchive-2.6.1:=[bzip2?,lzma?,zlib] )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# dbus problem
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with archive LibArchive)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with lzma LibLZMA)
-	)
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! has_version app-arch/rar ; then
-		elog "For creating rar archives, install app-arch/rar"
-	fi
-}
diff --git a/kde-base/freespacenotifier/Manifest b/kde-base/freespacenotifier/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/freespacenotifier/Manifest
+++ b/kde-base/freespacenotifier/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.11.9.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.11.9.ebuild
deleted file mode 100644
index ed4826adf04f..000000000000
--- a/kde-base/freespacenotifier/freespacenotifier-4.11.9.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/freespacenotifier-4.11.9.ebuild,v 1.5 2014/05/08 07:33:03 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/katepart/files/katepart-4.12.3-crash-fix.patch b/kde-base/katepart/files/katepart-4.12.3-crash-fix.patch
deleted file mode 100644
index e6e87da3184b..000000000000
--- a/kde-base/katepart/files/katepart-4.12.3-crash-fix.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-diff --git a/part/completion/katecompletionmodel.cpp b/part/completion/katecompletionmodel.cpp
-index 3fa8080..22af495 100644
---- a/part/completion/katecompletionmodel.cpp
-+++ b/part/completion/katecompletionmodel.cpp
-@@ -504,7 +504,7 @@ QModelIndex KateCompletionModel::indexForGroup( Group * g ) const
-   return createIndex(row, 0, 0);
- }
- 
--void KateCompletionModel::clearGroups( bool shouldReset )
-+void KateCompletionModel::clearGroups()
- {
-   clearExpanding();
-   m_ungrouped->clear();
-@@ -536,9 +536,6 @@ void KateCompletionModel::clearGroups( bool shouldReset )
- 
-   m_emptyGroups.append(m_bestMatches);
-   m_groupHash.insert(BestMatchesProperty, m_bestMatches);
--
--  if(shouldReset)
--    reset();
- }
- 
- QSet<KateCompletionModel::Group*> KateCompletionModel::createItems(const HierarchicalModelHandler& _handler, const QModelIndex& i, bool notifyModel) {
-@@ -577,9 +574,10 @@ QSet<KateCompletionModel::Group*> KateCompletionModel::deleteItems(const QModelI
- 
- void KateCompletionModel::createGroups()
- {
-+  beginResetModel();
-   //After clearing the model, it has to be reset, else we will be in an invalid state while inserting
-   //new groups.
--  clearGroups(true);
-+  clearGroups();
- 
-   bool has_groups=false;
-   foreach (CodeCompletionModel* sourceModel, m_completionModels) {
-@@ -600,10 +598,7 @@ void KateCompletionModel::createGroups()
-   makeGroupItemsUnique();
-   
-   updateBestMatches();
--  
--  reset();
--
--  emit contentGeometryChanged();
-+  endResetModel();
- }
- 
- KateCompletionModel::Group* KateCompletionModel::createItem(const HierarchicalModelHandler& handler, const QModelIndex& sourceIndex, bool notifyModel)
-@@ -660,9 +655,7 @@ void KateCompletionModel::slotRowsInserted( const QModelIndex & parent, int star
-     affectedGroups += createItems(handler, parent.isValid() ? parent.child(i, 0) :  handler.model()->index(i, 0), true);
- 
-   foreach (Group* g, affectedGroups)
--      hideOrShowGroup(g);
--
--    emit contentGeometryChanged();
-+      hideOrShowGroup(g, true);
- }
- 
- void KateCompletionModel::slotRowsRemoved( const QModelIndex & parent, int start, int end )
-@@ -678,9 +671,7 @@ void KateCompletionModel::slotRowsRemoved( const QModelIndex & parent, int start
-   }
- 
-   foreach (Group* g, affectedGroups)
--    hideOrShowGroup(g);
--
--  emit contentGeometryChanged();
-+    hideOrShowGroup(g, true);
- }
- 
- KateCompletionModel::Group* KateCompletionModel::fetchGroup( int attribute, const QString& scope, bool forceGrouping )
-@@ -938,31 +929,32 @@ void KateCompletionModel::setCurrentCompletion( KTextEditor::CodeCompletionModel
- 
-   m_currentMatch[model] = completion;
- 
--  bool needsReset = false;
-+  const bool resetModel = (changeType != Narrow);
-+  if (resetModel) {
-+    beginResetModel();
-+  }
-   
-   if (!hasGroups()) {
--    needsReset |= changeCompletions(m_ungrouped, changeType);
-+    changeCompletions(m_ungrouped, changeType, !resetModel);
-   } else {
-     foreach (Group* g, m_rowTable) {
-       if(g != m_argumentHints)
--        needsReset |= changeCompletions(g, changeType);
-+        changeCompletions(g, changeType, !resetModel);
-     }
-     foreach (Group* g, m_emptyGroups) {
-       if(g != m_argumentHints)
--        needsReset |= changeCompletions(g, changeType);
-+        changeCompletions(g, changeType, !resetModel);
-     }
-   }
- 
-   // NOTE: best matches are also updated in resort
-   resort();
- 
--  kDebug()<<"needsReset"<<needsReset;
--  if(needsReset)
--    reset();
-+  if (resetModel) {
-+    endResetModel();
-+  }
- 
-   clearExpanding(); //We need to do this, or be aware of expanding-widgets while filtering.
--  emit contentGeometryChanged();
--  kDebug();
- }
- 
- QString KateCompletionModel::commonPrefixInternal(const QString &forcePrefix) const
-@@ -1024,15 +1016,14 @@ QString KateCompletionModel::commonPrefix(QModelIndex selectedIndex) const
-   return commonPrefix;
- }
- 
--bool KateCompletionModel::changeCompletions( Group * g, changeTypes changeType )
-+void KateCompletionModel::changeCompletions( Group * g, changeTypes changeType, bool notifyModel )
- {
--  bool notifyModel = true;
-   if(changeType != Narrow) {
--    notifyModel = false;
-     g->filtered = g->prefilter;
-     //In the "Broaden" or "Change" case, just re-filter everything,
-     //and don't notify the model. The model is notified afterwards through a reset().
-   }
-+
-   //This code determines what of the filtered items still fit, and computes the ranges that were removed, giving
-   //them to beginRemoveRows(..) in batches
-   
-@@ -1054,14 +1045,13 @@ bool KateCompletionModel::changeCompletions( Group * g, changeTypes changeType )
-     }
-   }
-   
--  if(deleteUntil != -1) {
-+  if(deleteUntil != -1 && notifyModel) {
-     beginRemoveRows(indexForGroup(g), 0, deleteUntil);
-     endRemoveRows();
-   }
-   
-   g->filtered = newFiltered;
-   hideOrShowGroup(g, notifyModel);
--  return !notifyModel;
- }
- 
- int KateCompletionModel::Group::orderNumber() const {
-@@ -1193,7 +1183,9 @@ void KateCompletionModel::setSortingEnabled( bool enable )
- {
-   if (m_sortingEnabled != enable) {
-     m_sortingEnabled = enable;
-+    beginResetModel();
-     resort();
-+    endResetModel();
-   }
- }
- 
-@@ -1256,8 +1248,9 @@ const QList< QList < int > > & KateCompletionModel::columnMerges( ) const
- 
- void KateCompletionModel::setColumnMerges( const QList< QList < int > > & columnMerges )
- {
-+  beginResetModel();
-   m_columnMerges = columnMerges;
--  reset();
-+  endResetModel();
- }
- 
- int KateCompletionModel::translateColumn( int sourceColumn ) const
-@@ -1557,7 +1550,9 @@ void KateCompletionModel::setSortingAlphabetical( bool alphabetical )
- {
-   if (m_sortingAlphabetical != alphabetical) {
-     m_sortingAlphabetical = alphabetical;
-+    beginResetModel();
-     resort();
-+    endResetModel();
-   }
- }
- 
-@@ -1571,11 +1566,13 @@ void KateCompletionModel::setSortingCaseSensitivity( Qt::CaseSensitivity cs )
- {
-   if (m_sortingCaseSensitivity != cs) {
-     m_sortingCaseSensitivity = cs;
-+    beginResetModel();
-     resort();
-+    endResetModel();
-   }
- }
- 
--void KateCompletionModel::resort( )
-+void KateCompletionModel::resort()
- {
-   foreach (Group* g, m_rowTable)
-     g->resort();
-@@ -1585,7 +1582,6 @@ void KateCompletionModel::resort( )
- 
-   // call updateBestMatches here, so they are moved to the top again.
-   updateBestMatches();
--  emit contentGeometryChanged();
- }
- 
- bool KateCompletionModel::Item::isValid( ) const
-@@ -1654,6 +1650,7 @@ void KateCompletionModel::setMaximumInheritanceDepth( int maxDepth )
- 
- void KateCompletionModel::refilter( )
- {
-+  beginResetModel();
-   m_ungrouped->refilter();
- 
-   foreach (Group* g, m_rowTable)
-@@ -1667,6 +1664,7 @@ void KateCompletionModel::refilter( )
-   updateBestMatches();
- 
-   clearExpanding(); //We need to do this, or be aware of expanding-widgets while filtering.
-+  endResetModel();
- }
- 
- void KateCompletionModel::Group::refilter( )
-@@ -2048,20 +2046,19 @@ void KateCompletionModel::removeCompletionModel(CodeCompletionModel * model)
-   if (!model || !m_completionModels.contains(model))
-     return;
- 
-+  beginResetModel();
-   m_currentMatch.remove(model);
- 
--  clearGroups(false);
-+  clearGroups();
- 
-   model->disconnect(this);
- 
-   m_completionModels.removeAll(model);
-+  endResetModel();
- 
-   if (!m_completionModels.isEmpty()) {
-     // This performs the reset
-     createGroups();
--  }else{
--    emit contentGeometryChanged();
--    reset();
-   }
- }
- 
-@@ -2252,6 +2249,10 @@ void KateCompletionModel::rowSelected(const QModelIndex& row) {
- 
- void KateCompletionModel::clearCompletionModels()
- {
-+  if (m_completionModels.isEmpty())
-+    return;
-+
-+  beginResetModel();
-   foreach (CodeCompletionModel * model, m_completionModels)
-     model->disconnect(this);
- 
-@@ -2260,6 +2261,7 @@ void KateCompletionModel::clearCompletionModels()
-   m_currentMatch.clear();
- 
-   clearGroups();
-+  endResetModel();
- }
- 
- #include "katecompletionmodel.moc"
-diff --git a/part/completion/katecompletionmodel.h b/part/completion/katecompletionmodel.h
-index 5fedbcc..a10a533 100644
---- a/part/completion/katecompletionmodel.h
-+++ b/part/completion/katecompletionmodel.h
-@@ -183,7 +183,6 @@ class KATEPART_TESTS_EXPORT KateCompletionModel : public ExpandingWidgetModel
-     void expandIndex(const QModelIndex& index);
-     //Emitted whenever something has changed about the group of argument-hints
-     void argumentHintsChanged();
--    void contentGeometryChanged();
- 
-   public Q_SLOTS:
-     void setSortingEnabled(bool enable);
-@@ -311,6 +310,7 @@ class KATEPART_TESTS_EXPORT KateCompletionModel : public ExpandingWidgetModel
- 
-   private:
-     QString commonPrefixInternal(const QString &forcePrefix) const;
-+    /// @note performs model reset
-     void createGroups();
-     ///Creates all sub-items of index i, or the item corresponding to index i. Returns the affected groups.
-     ///i must be an index in the source model
-@@ -319,8 +319,9 @@ class KATEPART_TESTS_EXPORT KateCompletionModel : public ExpandingWidgetModel
-     ///i must be an index in the source model
-     QSet<Group*> deleteItems(const QModelIndex& i);
-     Group* createItem(const HierarchicalModelHandler&, const QModelIndex& i, bool notifyModel = false);
--    void clearGroups(bool reset = true);
--    void hideOrShowGroup(Group* g, bool notifyModel = true);
-+    /// @note Make sure you're in a {begin,end}ResetModel block when calling this!
-+    void clearGroups();
-+    void hideOrShowGroup(Group* g, bool notifyModel = false);
-     /// When forceGrouping is enabled, all given attributes will be used for grouping, regardless of the completion settings.
-     Group* fetchGroup(int attribute, const QString& scope = QString(), bool forceGrouping = false);
-     //If this returns nonzero on an index, the index is the header of the returned group
-@@ -336,7 +337,7 @@ class KATEPART_TESTS_EXPORT KateCompletionModel : public ExpandingWidgetModel
-     };
- 
-     //Returns whether the model needs to be reset
--    bool changeCompletions(Group* g, changeTypes changeType);
-+    void changeCompletions(Group* g, changeTypes changeType, bool notifyModel);
- 
-     bool hasCompletionModel() const;
- 
-diff --git a/part/completion/katecompletionwidget.cpp b/part/completion/katecompletionwidget.cpp
-index 64fa4ec..6dc63a0 100644
---- a/part/completion/katecompletionwidget.cpp
-+++ b/part/completion/katecompletionwidget.cpp
-@@ -325,7 +325,8 @@ void KateCompletionWidget::startCompletion(const KTextEditor::Range& word, const
- 
-   m_lastInvocationType = invocationType;
- 
--  disconnect(this->model(), SIGNAL(contentGeometryChanged()), this, SLOT(modelContentChanged()));
-+  disconnect(this->model(), SIGNAL(layoutChanged()), this, SLOT(modelContentChanged()));
-+  disconnect(this->model(), SIGNAL(modelReset()), this, SLOT(modelContentChanged()));
- 
-   m_dontShowArgumentHints = true;
- 
-@@ -412,7 +413,8 @@ void KateCompletionWidget::startCompletion(const KTextEditor::Range& word, const
-   cursorPositionChanged();
- 
-   if (!m_completionRanges.isEmpty()) {
--    connect(this->model(), SIGNAL(contentGeometryChanged()), this, SLOT(modelContentChanged()));
-+    connect(this->model(), SIGNAL(layoutChanged()), this, SLOT(modelContentChanged()));
-+    connect(this->model(), SIGNAL(modelReset()), this, SLOT(modelContentChanged()));
-     //Now that all models have been notified, check whether the widget should be displayed instantly
-     modelContentChanged();
-   }
\ No newline at end of file
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.9.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.9.ebuild
deleted file mode 100644
index 7c4fd83337e1..000000000000
--- a/kde-base/kcheckpass/kcheckpass-4.11.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.11.9.ebuild,v 1.6 2014/08/05 18:17:08 mrueg Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
-	pam? (
-		>=kde-base/kdebase-pam-7
-		virtual/pam
-	)
-"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kcminit/Manifest b/kde-base/kcminit/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kcminit/Manifest
+++ b/kde-base/kcminit/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kcminit/kcminit-4.11.9.ebuild b/kde-base/kcminit/kcminit-4.11.9.ebuild
deleted file mode 100644
index 7a82316c422c..000000000000
--- a/kde-base/kcminit/kcminit-4.11.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.11.9.ebuild,v 1.6 2014/08/05 18:17:12 mrueg Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KCMInit - runs startups initialization for Control Modules"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdebase-cursors/Manifest b/kde-base/kdebase-cursors/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kdebase-cursors/Manifest
+++ b/kde-base/kdebase-cursors/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.11.9.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.11.9.ebuild
deleted file mode 100644
index 395e87bbe3b2..000000000000
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.11.9.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/kdebase-cursors-4.11.9.ebuild,v 1.5 2014/05/08 07:32:54 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="cursors"
-inherit kde4-meta
-
-DESCRIPTION="oxygen cursors from kdebase"
-IUSE=""
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kdebase-startkde/files/sessionfile b/kde-base/kdebase-startkde/files/sessionfile
deleted file mode 100755
index bab47c26273b..000000000000
--- a/kde-base/kdebase-startkde/files/sessionfile
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
-
-# source of this file: x11-apps/xinit-1.3.0-r2
-
-case $# in
-1)
-	case $1 in
-	failsafe)
-		exec xterm -geometry 80x24-0-0
-		;;
-	esac
-esac
-
-# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-
-# clean up after xbanner
-if which freetemp 2> /dev/null ; then
-	freetemp
-fi
-
-userresources=$HOME/.Xresources 
-usermodmap=$HOME/.Xmodmap 
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources 
-sysmodmap=/etc/X11/Xmodmap 
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources 
-rh6sysmodmap=/etc/X11/xinit/Xmodmap 
-
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.9.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.9.ebuild
deleted file mode 100644
index 186b89f51f7f..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.11.9.ebuild,v 1.5 2014/05/08 07:32:38 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMNOMODULE="true"
-inherit kde4-meta prefix
-
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
-
-# The KDE apps called from the startkde script.
-# These provide the most minimal KDE desktop.
-RDEPEND="
-	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep kdebase-runtime-meta)
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep knotify)
-	$(add_kdebase_dep kreadconfig)
-	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksplash)
-	$(add_kdebase_dep kstartupconfig)
-	$(add_kdebase_dep kwin)
-	$(add_kdebase_dep phonon-kde)
-	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep plasma-workspace)
-	$(add_kdebase_dep systemsettings)
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	x11-apps/xset
-"
-
-KMEXTRACTONLY="
-	ConfigureChecks.cmake
-	kdm/
-	startkde.cmake
-"
-
-PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	cp "${FILESDIR}/KDE-4" "${T}"
-
-	# fix ${EPREFIX}
-	eprefixify startkde.cmake "${T}/KDE-4"
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/kde/startup
-	doins "${FILESDIR}/agent-startup.sh"
-
-	insinto /etc/kde/shutdown
-	doins "${FILESDIR}/agent-shutdown.sh"
-
-	# x11 session script
-	exeinto /etc/X11/Sessions
-	doexe "${T}/KDE-4"
-
-	# freedesktop compliant session script
-	sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
-		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
-	insinto /usr/share/xsessions
-	doins "${T}/KDE-4.desktop"
-}
-
-pkg_postinst () {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
-	elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
-	echo
-	elog "The name of the session script has changed."
-	elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your"
-	elog "configuration files, you will need to change it to"
-	elog "XSESSION=\"KDE-4\""
-}
diff --git a/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch b/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch
deleted file mode 100644
index 98bae45942d7..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 9a8426ae2ed35ac900b89a623618fc158d24ee6a
-Author: Tomáš Trnka <tomastrnka@gmx.com>
-Date:   Sun May 25 16:12:36 2014 +0200
-
-    Revert "Avoid unnecessary automounting in KDiskFreeSpaceInfo::freeSpaceInfo"
-    
-    This reverts commit 6246e99b43f3d1a9e15d563fbb5e173ed50ba5e5.
-    
-    It breaks KIO on CIFS mounts as the check for automounts copied over
-    from frameworks/kfileitem.cpp isDirectoryMounted() apparently matches
-    CIFS as well (and for some weird reason KIO checks for available space
-    before trying to copy files).
-    
-    We'll probably have to return to v1 of the abovementioned commit, i.e.
-    checking for "autofs" explicitly. However, more testing is apparently
-    necessary to avoid further nasty surprises.
-    
-    REVIEW: 117044
-    BUG: 334776
-    FIXED-IN: 4.13.2
-
-diff --git a/kio/kfile/kdiskfreespaceinfo.cpp b/kio/kfile/kdiskfreespaceinfo.cpp
-index 5c1fa72..f11eb09 100644
---- a/kio/kfile/kdiskfreespaceinfo.cpp
-+++ b/kio/kfile/kdiskfreespaceinfo.cpp
-@@ -33,7 +33,6 @@
- #include <QtCore/QDir>
- #include <windows.h>
- #else
--#include <QtCore/QFileInfo>
- #include <sys/statvfs.h>
- #endif
- 
-@@ -131,15 +130,6 @@ KDiskFreeSpaceInfo KDiskFreeSpaceInfo::freeSpaceInfo( const QString& path )
- #else
-     struct statvfs statvfs_buf;
- 
--    // Ignore autofs mountpoints as statvfs would trigger (expensive) automounting
--    // This also matches "special" filesystems like /proc where free space has no meaning
--    if (mp) {
--        QFileInfo fi(info.d->mountPoint);
--        if (fi.isDir() && fi.size() == 0) {
--            return info;
--        }
--    }
--
-     // Prefer mountPoint if available, so that it even works with non-existing files.
-     const QString pathArg = info.d->mountPoint.isEmpty() ? path : info.d->mountPoint;
-     if (!statvfs(QFile::encodeName(pathArg).constData(), &statvfs_buf)) {
diff --git a/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch b/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch
deleted file mode 100644
index 648d4fd7d4b8..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: David Faure <faure@kde.org>
-Date: Wed, 18 Jun 2014 18:29:04 +0000
-Subject: Don't require a job to handle messageboxes.
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
----
-Don't require a job to handle messageboxes.
-
-The POP3 ioslave doesn't have a job when it gets here.
----
-
-
---- a/kio/kio/usernotificationhandler.cpp
-+++ b/kio/kio/usernotificationhandler.cpp
-@@ -19,7 +19,7 @@
- #include "usernotificationhandler_p.h"
- 
- #include "slave.h"
--#include "job_p.h"
-+#include "jobuidelegate.h"
- 
- #include <kdebug.h>
- 
-@@ -76,19 +76,18 @@
- 
-         if (m_cachedResults.contains(key)) {
-             result = *(m_cachedResults[key]);
--        } else if (r->slave->job()) {
--            SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job());
--            if (jobPrivate) {
--                result = jobPrivate->requestMessageBox(r->type,
--                                                      r->data.value(MSG_TEXT).toString(),
--                                                      r->data.value(MSG_CAPTION).toString(),
--                                                      r->data.value(MSG_YES_BUTTON_TEXT).toString(),
--                                                      r->data.value(MSG_NO_BUTTON_TEXT).toString(),
--                                                      r->data.value(MSG_YES_BUTTON_ICON).toString(),
--                                                      r->data.value(MSG_NO_BUTTON_ICON).toString(),
--                                                      r->data.value(MSG_DONT_ASK_AGAIN).toString(),
--                                                      r->data.value(MSG_META_DATA).toMap());
--            }
-+        } else {
-+            JobUiDelegate ui;
-+            const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type);
-+            result = ui.requestMessageBox(type,
-+                                          r->data.value(MSG_TEXT).toString(),
-+                                          r->data.value(MSG_CAPTION).toString(),
-+                                          r->data.value(MSG_YES_BUTTON_TEXT).toString(),
-+                                          r->data.value(MSG_NO_BUTTON_TEXT).toString(),
-+                                          r->data.value(MSG_YES_BUTTON_ICON).toString(),
-+                                          r->data.value(MSG_NO_BUTTON_ICON).toString(),
-+                                          r->data.value(MSG_DONT_ASK_AGAIN).toString(),
-+                                          r->data.value(MSG_META_DATA).toMap());
-             m_cachedResults.insert(key, new int(result));
-         }
-     } else {
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.13.3-CVE-2014-5033.patch b/kde-base/kdelibs/files/kdelibs-4.13.3-CVE-2014-5033.patch
deleted file mode 100644
index 6d059b52eb31..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.13.3-CVE-2014-5033.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c36bf4f314e6ee1203898697abe294ed0c8dcb32 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
-Date: Mon, 21 Jul 2014 22:52:40 +0200
-Subject: [PATCH] Use dbus system bus name instead of PID for authentication.
-
-Using the PID for authentication is prone to a PID reuse
-race condition, and a security issue.
-
-REVIEW: 119323
----
- kdecore/auth/backends/polkit-1/Polkit1Backend.cpp | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-index cd7f6f3..732d2cb 100644
---- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-@@ -144,7 +144,7 @@ void Polkit1Backend::setupAction(const QString &action)
- 
- Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
- {
--    PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
-+    PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
-     PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
-                                                                                               PolkitQt1::Authority::None);
-     switch (r) {
-@@ -160,21 +160,12 @@ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
- 
- QByteArray Polkit1Backend::callerID() const
- {
--    QByteArray a;
--    QDataStream s(&a, QIODevice::WriteOnly);
--    s << QCoreApplication::applicationPid();
--
--    return a;
-+    return QDBusConnection::systemBus().baseService().toUtf8();
- }
- 
- bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
- {
--    QDataStream s(&callerID, QIODevice::ReadOnly);
--    qint64 pid;
--
--    s >> pid;
--
--    PolkitQt1::UnixProcessSubject subject(pid);
-+    PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
-     PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
- 
-     PolkitResultEventLoop e;
--- 
-1.8.5.5
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch
deleted file mode 100644
index 049cef87c03b..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur kdelibs-4.8.49.9999.orig/mimetypes/kde.xml kdelibs-4.8.49.9999/mimetypes/kde.xml
---- kdelibs-4.8.49.9999.orig/mimetypes/kde.xml	2011-12-27 04:20:35.982831561 +0100
-+++ kdelibs-4.8.49.9999/mimetypes/kde.xml	2011-12-27 04:30:15.747168085 +0100
-@@ -178,34 +178,6 @@
-     <glob pattern="*.abc"/>
-   </mime-type>
- 
--  <!-- all/ fake mime types -->
--  <mime-type type="all/all">
--    <comment>all files and folders</comment>
--  </mime-type>
--  <mime-type type="all/allfiles">
--    <comment>all files</comment>
--  </mime-type>
--
--  <!-- uri/ fake mime types -->
--  <mime-type type="uri/mms">
--    <comment>mms: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/mmst">
--    <comment>mmst: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/mmsu">
--    <comment>mmsu: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/pnm">
--    <comment>pnm: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/rtspt">
--    <comment>rtspt: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/rtspu">
--    <comment>rtspu: URIs</comment>
--  </mime-type>
--
-   <mime-type type="application/vnd.kde.fontspackage">
-     <sub-class-of type="application/zip"/>
-     <comment>fonts package</comment>
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kdm/files/kdm-4.11.9-desktopnamescrash.patch b/kde-base/kdm/files/kdm-4.11.9-desktopnamescrash.patch
deleted file mode 100644
index e4fd023389c7..000000000000
--- a/kde-base/kdm/files/kdm-4.11.9-desktopnamescrash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2a5a6a02f5df0a6acf480f3c8118afd9f457369b Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
-Date: Thu, 1 May 2014 23:55:22 +0200
-Subject: [PATCH] Revert "kdm: read DesktopNames from session file and export
- XDG_CURRENT_DESKTOP from it"
-
-This reverts commit e7ce8adc506068491c8545a1990992267598bd33.
----
- kdm/backend/client.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/kdm/backend/client.c b/kdm/backend/client.c
-index 335cc3e..26bb0b4 100644
---- a/kdm/backend/client.c
-+++ b/kdm/backend/client.c
-@@ -1809,13 +1809,6 @@ startClient(volatile int *pid)
-                     if (!strCmp(iniEntry(str, "Desktop Entry", "Hidden", 0), "true") ||
-                             !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
-                         sessargs = "";
--                    buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
--                    for (buf2 = buf; *buf2; ++buf2) {
--                        if (*buf2 == ';')
--                            *buf2 = ':';
--                    }
--                    userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
--                    free(buf);
-                     free(str);
-                     free(fname);
-                     goto gotit;
--- 
-1.9.2
-
diff --git a/kde-base/kdm/kdm-4.11.9-r1.ebuild b/kde-base/kdm/kdm-4.11.9-r1.ebuild
deleted file mode 100644
index 5ee6b6fb4656..000000000000
--- a/kde-base/kdm/kdm-4.11.9-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.11.9-r1.ebuild,v 1.5 2014/05/08 07:32:42 ago Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit systemd kde4-meta flag-o-matic user
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +consolekit kerberos pam systemd"
-
-REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	media-libs/qimageblitz
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXtst
-	consolekit? (
-		>=sys-apps/dbus-1.0.2
-		sys-auth/consolekit
-	)
-	kerberos? ( virtual/krb5 )
-	pam? (
-		$(add_kdebase_dep kcheckpass)
-		virtual/pam
-	)
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepasswd)
-	>=x11-apps/xinit-1.0.5-r2
-	x11-apps/xmessage
-"
-
-KMEXTRA="
-	libs/kdm/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
-	"${FILESDIR}/${PN}-4.11.9-desktopnamescrash.patch"
-)
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-
-	# Create kdm:kdm user
-	KDM_HOME=/var/lib/kdm
-	enewgroup kdm
-	enewuser kdm -1 -1 "${KDM_HOME}" kdm
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
-		$(cmake-utils_use_with pam)
-		$(cmake-utils_use_with consolekit CkConnector)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	export GENKDMCONF_FLAGS="--no-old --no-backup"
-
-	kde4-meta_src_install
-
-	# an equivalent file is already installed by kde-base/startkde, bug 377151
-	rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
-
-	# Customize the kdmrc configuration:
-	# - SessionDirs set to /usr/share/xsessions
-	# - increase server timeout to 30s
-	# - TerminateServer=true to workaround X server regen bug, bug 278473
-	# - DataDir set to /var/lib/kdm
-	# - FaceDir set to /var/lib/kdm/faces
-	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
-		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-		-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
-		-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
-		-i "${ED}"/usr/share/config/kdm/kdmrc \
-		|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
-
-	# Don't install empty dir
-	rmdir "${ED}"/usr/share/config/kdm/sessions
-
-	# Set up permissions to kdm work directory
-	keepdir "${KDM_HOME}"
-	fowners root:kdm "${KDM_HOME}"
-	fperms 1770 "${KDM_HOME}"
-
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/kdm-logrotate kdm
-
-	systemd_dounit "${FILESDIR}"/kdm.service
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	local file src dest dir old_dirs=(
-		/var/lib/kdm-live
-		/var/lib/kdm-4.6
-		/var/lib/kdm-4.5
-		/var/lib/kdm-4.4
-		/usr/share/apps/kdm
-		/usr/kde/4.4/share/apps/kdm
-		/usr/kde/4.3/share/apps/kdm
-		/usr/kde/4.2/share/apps/kdm
-	)
-
-	mkdir -p "${EROOT}${KDM_HOME}/faces"
-	# Set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
-		src=${file#*:}
-		dest=${file%:*}
-		if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
-			for dir in "${old_dirs[@]}"; do
-				if [[ -e ${EROOT}${dir}/${dest} ]]; then
-					cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
-					break 2
-				fi
-			done
-			if [[ -n ${src} ]]; then
-				cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
-					"${EROOT}${KDM_HOME}/${dest}"
-			fi
-		fi
-	done
-	for dir in "${old_dirs[@]}"; do
-		if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
-			echo
-			elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
-			elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
-			echo
-			elog "After doing so, you may delete the directory."
-			echo
-		fi
-	done
-
-	# Make sure permissions are correct -- old installations may have
-	# gotten this wrong
-	use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
-	chmod 1770 "${EROOT}${KDM_HOME}"
-
-	if use consolekit; then
-		echo
-		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
-		elog "make sure consolekit daemon is running and started at login time"
-		elog
-		elog "rc-update add consolekit default && /etc/init.d/consolekit start"
-		echo
-	fi
-}
diff --git a/kde-base/kephal/Manifest b/kde-base/kephal/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kephal/Manifest
+++ b/kde-base/kephal/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kephal/kephal-4.11.9.ebuild b/kde-base/kephal/kephal-4.11.9.ebuild
deleted file mode 100644
index b2676420e39b..000000000000
--- a/kde-base/kephal/kephal-4.11.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.11.9.ebuild,v 1.5 2014/05/08 07:32:59 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kephal"
-inherit kde4-meta
-
-DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-"
-
-KMEXTRACTONLY+="
-	kephal/kephal/screens.h
-"
diff --git a/kde-base/khotkeys/Manifest b/kde-base/khotkeys/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/khotkeys/Manifest
+++ b/kde-base/khotkeys/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/khotkeys/khotkeys-4.11.9.ebuild b/kde-base/khotkeys/khotkeys-4.11.9.ebuild
deleted file mode 100644
index ca6d958b00d4..000000000000
--- a/kde-base/khotkeys/khotkeys-4.11.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.11.9.ebuild,v 1.5 2014/05/08 07:32:23 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libs/kworkspace/
-"
diff --git a/kde-base/kinfocenter/Manifest b/kde-base/kinfocenter/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kinfocenter/Manifest
+++ b/kde-base/kinfocenter/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.9.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.9.ebuild
deleted file mode 100644
index 8807e9c4f8b2..000000000000
--- a/kde-base/kinfocenter/kinfocenter-4.11.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.11.9.ebuild,v 1.5 2014/05/08 08:37:19 zlogene Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Info Center"
-HOMEPAGE="http://www.kde.org/applications/system/kinfocenter/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug ieee1394"
-
-DEPEND="
-	sys-apps/pciutils
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with ieee1394 RAW1394)
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
\ No newline at end of file
diff --git a/kde-base/klipper/Manifest b/kde-base/klipper/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/klipper/Manifest
+++ b/kde-base/klipper/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/klipper/klipper-4.11.9.ebuild b/kde-base/klipper/klipper-4.11.9.ebuild
deleted file mode 100644
index cf5d1aecd354..000000000000
--- a/kde-base/klipper/klipper-4.11.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.11.9.ebuild,v 1.5 2014/05/08 07:32:47 ago Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Applet for KDE and X clipboard management"
-HOMEPAGE+=" http://userbase.kde.org/Klipper"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug prison"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libtaskmanager)
-	sys-libs/zlib
-	x11-libs/libX11
-	prison? ( media-libs/prison )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with prison)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kmenuedit/Manifest
+++ b/kde-base/kmenuedit/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kmenuedit/kmenuedit-4.11.9.ebuild b/kde-base/kmenuedit/kmenuedit-4.11.9.ebuild
deleted file mode 100644
index 9f8260dc13ba..000000000000
--- a/kde-base/kmenuedit/kmenuedit-4.11.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.11.9.ebuild,v 1.5 2014/05/08 07:32:34 ago Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu editor"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep khotkeys)
-"
-DEPEND=${RDEPEND}
-
-KMEXTRACTONLY="
-	libs/kworkspace/
-"
-
-src_configure() {
-	sed -i -e \
-		"s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:${EPREFIX}/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
-		kmenuedit/CMakeLists.txt \
-		|| die "sed failed"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml
index 2b780f97bf6d..bb56cc6f689d 100644
--- a/kde-base/kopete/metadata.xml
+++ b/kde-base/kopete/metadata.xml
@@ -25,7 +25,6 @@
 	<flag name="irc">Enable the IRC protocol handler.</flag>
 	-->
 	<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
-	<flag name="msn">Enable "Windows live messenger" protocol support.</flag>
 	<flag name="skype">Enable Skype protocol handler (not fully functional yet).</flag>
 	<!-- uncomment this when enabled in ebuild
 	<flag name="telepathy">Enable support for the real-time communication framework telepathy.</flag>
diff --git a/kde-base/korundum/korundum-4.14.3-r1.ebuild b/kde-base/korundum/korundum-4.14.3-r1.ebuild
index f97cbde3d81d..7fd4e9e18b04 100644
--- a/kde-base/korundum/korundum-4.14.3-r1.ebuild
+++ b/kde-base/korundum/korundum-4.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.14.3-r1.ebuild,v 1.4 2015/02/17 11:06:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.14.3-r1.ebuild,v 1.5 2015/02/19 05:48:40 kensington Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ USE_RUBY="ruby20"
 inherit kde4-base ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="akonadi debug kate nepomuk okular"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Ruby"
 
diff --git a/kde-base/korundum/korundum-4.14.3.ebuild b/kde-base/korundum/korundum-4.14.3.ebuild
deleted file mode 100644
index 6e8077e72dbd..000000000000
--- a/kde-base/korundum/korundum-4.14.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.14.3.ebuild,v 1.3 2014/12/11 13:05:46 zlogene Exp $
-
-EAPI=5
-
-OPENGL_REQUIRED="always"
-
-USE_RUBY="ruby19"
-# Only one ruby version is supported:
-# 1) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-base ruby-ng
-
-DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="akonadi debug kate nepomuk okular"
-HOMEPAGE="http://techbase.kde.org/Development/Languages/Ruby"
-
-DEPEND="
-	$(add_kdebase_dep qtruby 'ruby_targets_ruby19')
-	$(add_kdebase_dep smokekde 'akonadi?,kate?,okular?,nepomuk?')
-	$(add_kdebase_dep smokeqt)
-"
-RDEPEND="${DEPEND}
-"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-base_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-base_src_prepare
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	local mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with nepomuk)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-	)
-	kde4-base_src_configure
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-base_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-base_src_install
-}
diff --git a/kde-base/krfb/files/krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch b/kde-base/krfb/files/krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch
deleted file mode 100644
index 32d91a80e823..000000000000
--- a/kde-base/krfb/files/krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 08f7c0c3d122f6096408007a0ac44c586c1c36b7 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Thu, 31 Jul 2014 19:41:01 +0200
-Subject: [PATCH] CVE-2014-4607: Unbundle libvncserver
-
-http://seclists.org/oss-sec/2014/q2/676
-
-REVIEW: 119548
----
- CMakeLists.txt                       | 12 +++++++----
- cmake/modules/FindLibVNCServer.cmake | 41 ++++++++++++++++++++++++++++++++++++
- krfb/CMakeLists.txt                  |  2 ++
- krfb/rfb.h                           |  2 +-
- 4 files changed, 52 insertions(+), 5 deletions(-)
- create mode 100644 cmake/modules/FindLibVNCServer.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78c19b3..7b0af64 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,6 +26,13 @@ if(NOT INSIDE_KDENETWORK)
-     include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
- endif(NOT INSIDE_KDENETWORK)
- 
-+set(CMAKE_MODULE_PATH
-+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-+    ${CMAKE_MODULE_PATH}
-+)
-+
-+find_package(LibVNCServer REQUIRED)
-+
- macro_optional_find_package(TelepathyQt4)
- macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes support.")
- 
-@@ -35,8 +42,6 @@ macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
- include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
-                      "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
-                      "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
--                     "${CMAKE_CURRENT_SOURCE_DIR}/libvncserver/"
--                     "${CMAKE_CURRENT_BINARY_DIR}/libvncserver/"
- )
- 
- if(Q_WS_X11)
-@@ -45,9 +50,8 @@ if(Q_WS_X11)
-   endif(NOT X11_XTest_FOUND)
- endif(Q_WS_X11)
- 
--add_subdirectory(libvncserver)
- add_subdirectory(krfb)
--add_subdirectory (framebuffers)
-+add_subdirectory(framebuffers)
- add_subdirectory(doc)
- 
- if (NOT INSIDE_KDENETWORK)
-diff --git a/cmake/modules/FindLibVNCServer.cmake b/cmake/modules/FindLibVNCServer.cmake
-new file mode 100644
-index 0000000..5927ab2
---- /dev/null
-+++ b/cmake/modules/FindLibVNCServer.cmake
-@@ -0,0 +1,41 @@
-+# cmake macro to test LIBVNCSERVER LIB
-+
-+# Copyright (c) 2006, Alessandro Praduroux <pradu@pradu.it>
-+# Copyright (c) 2007, Urs Wolfer <uwolfer @ kde.org>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+INCLUDE(CheckPointerMember)
-+
-+IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+    # Already in cache, be silent
-+    SET(LIBVNCSERVER_FIND_QUIETLY TRUE)
-+ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+
-+FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h)
-+
-+FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver)
-+
-+# libvncserver and libvncclient are in the same package, so it does
-+# not make sense to add a new cmake script for finding libvncclient.
-+# instead just find the libvncclient also in this file.
-+FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h)
-+FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient)
-+
-+IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+   SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}")
-+   CHECK_POINTER_MEMBER(rfbClient* GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
-+ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+
-+IF (LIBVNCSERVER_FOUND)
-+  IF (NOT LIBVNCSERVER_FIND_QUIETLY)
-+    MESSAGE(STATUS "Found LibVNCServer: ${LIBVNCSERVER_LIBRARIES}")
-+  ENDIF (NOT LIBVNCSERVER_FIND_QUIETLY)
-+ELSE (LIBVNCSERVER_FOUND)
-+  IF (LIBVNCSERVER_FIND_REQUIRED)
-+    MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibVNCServer (version 0.9 or later required).")
-+  ENDIF (LIBVNCSERVER_FIND_REQUIRED)
-+ENDIF (LIBVNCSERVER_FOUND)
-+
-+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
-\ No newline at end of file
-diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
-index bbc508d..08ee30c 100644
---- a/krfb/CMakeLists.txt
-+++ b/krfb/CMakeLists.txt
-@@ -20,6 +20,7 @@ target_link_libraries (krfbprivate
-                        ${QT_QTCORE_LIBRARY}
-                        ${QT_QTGUI_LIBRARY}
-                        ${X11_X11_LIB}
-+                       ${LIBVNCSERVER_LIBRARIES}
- )
- 
- set_target_properties (krfbprivate PROPERTIES
-@@ -104,6 +105,7 @@ target_link_libraries (krfb
-                        ${QT_QTNETWORK_LIBRARY}
-                        ${KDE4_KDNSSD_LIBS}
-                        ${KDE4_KDEUI_LIBS}
-+                       ${LIBVNCSERVER_LIBRARIES}
- )
- 
- if(TelepathyQt4_FOUND)
-diff --git a/krfb/rfb.h b/krfb/rfb.h
-index 40308a2..fa94eda 100644
---- a/krfb/rfb.h
-+++ b/krfb/rfb.h
-@@ -6,7 +6,7 @@
- #ifndef KRFB_RFB_H
- #define KRFB_RFB_H
- 
--#include "../libvncserver/rfb/rfb.h"
-+#include "rfb/rfb.h"
- 
- #undef TRUE
- #undef FALSE
--- 
-2.0.2
-
diff --git a/kde-base/krossruby/krossruby-4.14.3-r1.ebuild b/kde-base/krossruby/krossruby-4.14.3-r1.ebuild
index 5559c8c74212..613cc0d71614 100644
--- a/kde-base/krossruby/krossruby-4.14.3-r1.ebuild
+++ b/kde-base/krossruby/krossruby-4.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.14.3-r1.ebuild,v 1.4 2015/02/17 11:06:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.14.3-r1.ebuild,v 1.5 2015/02/19 06:52:51 kensington Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ USE_RUBY="ruby20"
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="Kross scripting framework: Ruby interpreter"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=""
diff --git a/kde-base/krossruby/krossruby-4.14.3.ebuild b/kde-base/krossruby/krossruby-4.14.3.ebuild
deleted file mode 100644
index 85efbe3da19a..000000000000
--- a/kde-base/krossruby/krossruby-4.14.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.14.3.ebuild,v 1.2 2014/12/11 13:05:53 zlogene Exp $
-
-EAPI=5
-
-KMNAME="kross-interpreters"
-KMMODULE="ruby"
-
-USE_RUBY="ruby19"
-# Only one ruby version is supported:
-# 1) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="Kross scripting framework: Ruby interpreter"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-}
-
-each_ruby_configure() {
-	local CMAKE_USE_DIR=${S}
-	local mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_DIR=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-	)
-	kde4-meta_src_configure
-}
-
-each_ruby_compile() {
-	local CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	local CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}
diff --git a/kde-base/krunner/Manifest b/kde-base/krunner/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/krunner/Manifest
+++ b/kde-base/krunner/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/krunner/krunner-4.11.9.ebuild b/kde-base/krunner/krunner-4.11.9.ebuild
deleted file mode 100644
index 0e309156e099..000000000000
--- a/kde-base/krunner/krunner-4.11.9.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/kde-base/krunner/krunner-4.11.9.ebuild,v 1.5 2014/05/08 07:32:41 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-HOMEPAGE+=" http://userbase.kde.org/Plasma/Krunner"
-IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kcheckpass)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-	)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libs/kdm/
-	libs/kephal/
-	libs/ksysguard/
-	libs/kworkspace/
-	libs/plasmagenericshell/
-	kcheckpass/
-	ksmserver/org.kde.KSMServerInterface.xml
-	ksysguard/
-	plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kscreensaver/kscreensaver-4.11.9.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.9.ebuild
deleted file mode 100644
index 170ac6f17807..000000000000
--- a/kde-base/kscreensaver/kscreensaver-4.11.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.11.9.ebuild,v 1.5 2014/05/08 07:32:03 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE screensaver framework"
-KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kcheckpass)
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
-)
diff --git a/kde-base/ksmserver/Manifest b/kde-base/ksmserver/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/ksmserver/Manifest
+++ b/kde-base/ksmserver/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/ksmserver/ksmserver-4.11.9.ebuild b/kde-base/ksmserver/ksmserver-4.11.9.ebuild
deleted file mode 100644
index d69906326015..000000000000
--- a/kde-base/ksmserver/ksmserver-4.11.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.11.9.ebuild,v 1.5 2014/05/08 07:32:19 ago Exp $
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep libkworkspace)
-	media-libs/qimageblitz
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXrender
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdm)
-"
-
-KMEXTRACTONLY="
-	kcminit/main.h
-	libs/kdm/kgreeterplugin.h
-	kcheckpass/
-	libs/kephal/
-	libs/kworkspace/
-"
-
-KMLOADLIBS="libkworkspace"
diff --git a/kde-base/ksplash/Manifest b/kde-base/ksplash/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/ksplash/Manifest
+++ b/kde-base/ksplash/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/ksplash/ksplash-4.11.9.ebuild b/kde-base/ksplash/ksplash-4.11.9.ebuild
deleted file mode 100644
index d4ad226f31f3..000000000000
--- a/kde-base/ksplash/ksplash-4.11.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.11.9.ebuild,v 1.6 2015/01/28 22:13:58 mgorny Exp $
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse
-cpu_flags_x86_sse2 xinerama"
-
-COMMONDEPEND="
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/libXext
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
-		$(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
-		$(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
-		$(cmake-utils_use_with xinerama)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kstartupconfig/Manifest b/kde-base/kstartupconfig/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kstartupconfig/Manifest
+++ b/kde-base/kstartupconfig/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.11.9.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.11.9.ebuild
deleted file mode 100644
index 24a7caa99b42..000000000000
--- a/kde-base/kstartupconfig/kstartupconfig-4.11.9.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.11.9.ebuild,v 1.5 2014/05/08 07:32:02 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstyles/Manifest b/kde-base/kstyles/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kstyles/Manifest
+++ b/kde-base/kstyles/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kstyles/kstyles-4.11.9.ebuild b/kde-base/kstyles/kstyles-4.11.9.ebuild
deleted file mode 100644
index ee85b73ea2f1..000000000000
--- a/kde-base/kstyles/kstyles-4.11.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.11.9.ebuild,v 1.6 2014/08/05 18:17:09 mrueg Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A set of different KDE styles"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	kde-base/liboxygenstyle:4=
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libs/oxygen
-"
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/ksysguard/ksysguard-4.11.9.ebuild b/kde-base/ksysguard/ksysguard-4.11.9.ebuild
deleted file mode 100644
index 16dcf57b8400..000000000000
--- a/kde-base/ksysguard/ksysguard-4.11.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.11.9.ebuild,v 1.6 2014/08/05 18:17:16 mrueg Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="KSysguard is a network enabled task manager and system monitor application"
-HOMEPAGE+=" http://userbase.kde.org/KSysGuard"
-KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug lm_sensors test"
-
-DEPEND="
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXres
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# bug 393091
-
-KMEXTRA="
-	libs/ksysguard/
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with lm_sensors Sensors)
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	ewarn "Note that ksysguard has powerful features; one of these is the executing of arbitrary"
-	ewarn "programs with elevated privileges (as data sources). So be careful opening worksheets"
-	ewarn "from untrusted sources!"
-}
diff --git a/kde-base/ksystraycmd/Manifest b/kde-base/ksystraycmd/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/ksystraycmd/Manifest
+++ b/kde-base/ksystraycmd/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.11.9.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.11.9.ebuild
deleted file mode 100644
index 8d31573e790c..000000000000
--- a/kde-base/ksystraycmd/ksystraycmd-4.11.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.11.9.ebuild,v 1.6 2014/08/05 18:17:22 mrueg Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch b/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch
deleted file mode 100644
index e5db9a06335d..000000000000
--- a/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4b4a7c752ae305c168b0a3e89ad2f49c54cadd5d Mon Sep 17 00:00:00 2001
-From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
-Date: Thu, 12 Jun 2014 14:56:20 +0200
-Subject: [PATCH] Properly set titleHeight to zero when hideTitleBar is
- selected. CCBUG: 336128
-
----
- kwin/clients/oxygen/oxygenclient.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/kwin/clients/oxygen/oxygenclient.cpp b/kwin/clients/oxygen/oxygenclient.cpp
-index a7d8d7a..ebc0274 100644
---- a/kwin/clients/oxygen/oxygenclient.cpp
-+++ b/kwin/clients/oxygen/oxygenclient.cpp
-@@ -394,8 +394,11 @@ namespace Oxygen
- 
-             case LM_TitleHeight:
-             {
--                const int titleHeight = QFontMetrics(options()->font(true)).height();
--                return qMax(buttonSize, titleHeight);
-+                if( hideTitleBar() ) return 0;
-+                else {
-+                    const int titleHeight = QFontMetrics(options()->font(true)).height();
-+                    return qMax(buttonSize, titleHeight);
-+                }
-             }
- 
-             case LM_ButtonSpacing:
--- 
-1.8.5.5
-
diff --git a/kde-base/kwin/kwin-4.11.9.ebuild b/kde-base/kwin/kwin-4.11.9.ebuild
deleted file mode 100644
index 4e6571baa3be..000000000000
--- a/kde-base/kwin/kwin-4.11.9.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.11.9.ebuild,v 1.5 2014/05/08 07:32:51 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="always"
-
-#VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 8: kwin-TestVirtualDesktops hangs even with virtualx
-
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE window manager"
-HOMEPAGE+=" http://userbase.kde.org/KWin"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles opengl wayland"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs opengl)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep liboxygenstyle)
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	opengl? ( >=media-libs/mesa-7.10 )
-	gles? ( >=media-libs/mesa-7.12[egl(+),gles2] )
-	wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] )
-"
-DEPEND="${COMMONDEPEND}
-	x11-libs/xcb-util-renderutil
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
-	x11-apps/scripts
-"
-
-KMEXTRACTONLY="
-	ksmserver/
-	libs/kephal/
-	libs/oxygen/
-"
-
-# you need one of these
-REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )"
-
-src_configure() {
-	# FIXME Remove when activity API moved away from libkworkspace
-	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
-
-	mycmakeargs=(
-		$(cmake-utils_use_with gles OpenGLES)
-		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with wayland Wayland)
-		-DWITH_X11_Xcomposite=ON
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kwrited/Manifest b/kde-base/kwrited/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/kwrited/Manifest
+++ b/kde-base/kwrited/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/kwrited/kwrited-4.11.9.ebuild b/kde-base/kwrited/kwrited-4.11.9.ebuild
deleted file mode 100644
index fb948fbb0a65..000000000000
--- a/kde-base/kwrited/kwrited-4.11.9.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.11.9.ebuild,v 1.6 2014/08/05 18:17:10 mrueg Exp $
-
-EAPI=5
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	|| ( >=sys-libs/libutempter-1.1.5 >=sys-freebsd/freebsd-lib-9.0 )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/libkworkspace/libkworkspace-4.11.9.ebuild b/kde-base/libkworkspace/libkworkspace-4.11.9.ebuild
deleted file mode 100644
index 098f79a2b16e..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.11.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.11.9.ebuild,v 1.5 2014/05/08 07:33:05 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	ksmserver/org.kde.KSMServerInterface.xml
-	kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-DEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXau
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
-		libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/liboxygenstyle/Manifest b/kde-base/liboxygenstyle/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/liboxygenstyle/Manifest
+++ b/kde-base/liboxygenstyle/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.11.9.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.11.9.ebuild
deleted file mode 100644
index 968afed7be3e..000000000000
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.11.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.11.9.ebuild,v 1.5 2014/05/08 07:32:55 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/oxygen"
-inherit kde4-meta
-
-DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-SLOT="4/${PV}"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libplasmaclock/Manifest b/kde-base/libplasmaclock/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/libplasmaclock/Manifest
+++ b/kde-base/libplasmaclock/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.11.9-r1.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.11.9-r1.ebuild
deleted file mode 100644
index 47cc52820270..000000000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.11.9-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.11.9-r1.ebuild,v 1.1 2014/05/13 17:42:48 johu Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmaclock"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +kdepim"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with kdepim KdepimLibs)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.11.9.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.11.9.ebuild
deleted file mode 100644
index f48566b697aa..000000000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.11.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.11.9.ebuild,v 1.5 2014/05/08 07:32:22 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmaclock"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	semantic-desktop? ( $(add_kdebase_dep kdepimlibs) )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libplasmagenericshell/Manifest b/kde-base/libplasmagenericshell/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/libplasmagenericshell/Manifest
+++ b/kde-base/libplasmagenericshell/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.9.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.9.ebuild
deleted file mode 100644
index 00767b9558ad..000000000000
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.9.ebuild,v 1.5 2014/05/08 07:32:23 ago Exp $
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmagenericshell"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug test"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/kephal/
-	plasma/desktop/shell/data/
-"
diff --git a/kde-base/libtaskmanager/Manifest b/kde-base/libtaskmanager/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/libtaskmanager/Manifest
+++ b/kde-base/libtaskmanager/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.9.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.9.ebuild
deleted file mode 100644
index 0ded9e2c49cd..000000000000
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.11.9.ebuild,v 1.5 2014/05/08 07:33:01 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/taskmanager"
-inherit kde4-meta
-
-DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/
-	libs/kworkspace/
-"
-
-src_prepare() {
-	kde4-meta_src_prepare
-	sed -e 's:ksysguard/processcore/processes.h:ksysguard/processes.h:g' -i "${S}/libs/taskmanager/taskitem.cpp" || die
-	sed -e 's:ksysguard/processcore/process.h:ksysguard/process.h:g' -i "${S}/libs/taskmanager/taskitem.cpp" || die
-}
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.9-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.9-r1.ebuild
deleted file mode 100644
index e41e81cf58eb..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.9-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.11.9-r1.ebuild,v 1.4 2014/12/31 12:38:36 kensington Exp $
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-KMMODULE="plasma"
-PYTHON_COMPAT=( python2_7 )
-OPENGL_REQUIRED="always"
-inherit python-single-r1 kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gps json +kdepim nepomuk python qalculate"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMONDEPEND="
-	dev-libs/libdbusmenu-qt[qt4(+)]
-	>=dev-qt/qtcore-4.8.4-r3:4
-	!kde-misc/ktouchpadenabler
-	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs 'nepomuk?')
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmaclock 'kdepim?')
-	$(add_kdebase_dep libplasmagenericshell)
-	$(add_kdebase_dep libtaskmanager)
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	gps? ( >=sci-geosciences/gpsd-2.37 )
-	json? ( dev-libs/qjson )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	nepomuk? (
-		dev-libs/soprano
-		$(add_kdebase_dep nepomuk-core)
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/PyQt4-4.4.0[X,${PYTHON_USEDEP}]
-		$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
-	)
-	qalculate? ( sci-libs/libqalculate )
-"
-DEPEND="${COMMONDEPEND}
-	dev-libs/boost
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep plasma-runtime)
-"
-
-KMEXTRA="
-	appmenu/
-	ktouchpadenabler/
-	statusnotifierwatcher/
-"
-KMEXTRACTONLY="
-	kcheckpass/
-	krunner/dbus/org.freedesktop.ScreenSaver.xml
-	krunner/dbus/org.kde.krunner.App.xml
-	ksmserver/org.kde.KSMServerInterface.xml
-	ksmserver/screenlocker/
-	libs/kephal/
-	libs/kworkspace/
-	libs/taskmanager/
-	libs/plasmagenericshell/
-	libs/ksysguard/
-	libs/kdm/kgreeterplugin.h
-	ksysguard/
-"
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+=" doc/plasma-desktop"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with gps libgps)
-		$(cmake-utils_use_with json QJSON)
-		$(cmake-utils_use_with kdepim Akonadi)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with nepomuk NepomukCore)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_with python PythonLibrary)
-		$(cmake-utils_use_with qalculate)
-		-DWITH_Xmms=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	if use python; then
-		python_optimize "${ED}"
-	fi
-}
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/powerdevil/powerdevil-4.11.9.ebuild b/kde-base/powerdevil/powerdevil-4.11.9.ebuild
deleted file mode 100644
index ccf1b13598ad..000000000000
--- a/kde-base/powerdevil/powerdevil-4.11.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.11.9.ebuild,v 1.6 2014/08/05 18:17:21 mrueg Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement"
-HOMEPAGE="http://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +pm-utils"
-
-DEPEND="
-	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep libkworkspace)
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-	)
-"
-RDEPEND="${DEPEND}
-	pm-utils? ( sys-power/pm-utils )
-"
-
-KMEXTRACTONLY="
-	krunner/
-	ksmserver/org.kde.KSMServerInterface.xml
-	ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml
-"
diff --git a/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch b/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch
deleted file mode 100644
index 58c59dd61078..000000000000
--- a/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/libkcups/KCupsConnection.cpp b/libkcups/KCupsConnection.cpp
-index 713be2f..335fc46 100644
---- a/libkcups/KCupsConnection.cpp
-+++ b/libkcups/KCupsConnection.cpp
-@@ -377,11 +377,11 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
-         response = request.sendIppRequest();
-     } while (retry("/", operation));
- 
--#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     if (response && ippGetStatusCode(response) == IPP_OK) {
- #else
-     if (response && response->request.status.status_code == IPP_OK) {
--#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-         ipp_attribute_t *attr;
-         if (subscriptionId >= 0) {
-             // Request was ok, just return the current subscription
-@@ -392,7 +392,7 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
-             kWarning() << "No notify-subscription-id in response!";
-             ret = -1;
-         } else {
--#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-             ret = ippGetInteger(attr, 0);
-         }
-     } else if (subscriptionId >= 0 && response && ippGetStatusCode(response) == IPP_NOT_FOUND) {
-@@ -406,7 +406,7 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
-         kDebug() << "Subscription not found";
-         // When the subscription is not found try to get a new one
-         return renewDBusSubscription(-1, leaseDuration, events);
--#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     } else {
-         kDebug() << "Request failed" << cupsLastError() << httpGetStatus(CUPS_HTTP_DEFAULT);
-         // When the server stops/restarts we will have some error so ignore it
-@@ -582,7 +582,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
-     ipp_attribute_t *attr;
-     ReturnArguments ret;
- 
--#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     QVariantHash destAttributes;
-     for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
-         // We hit an attribute sepparator
-@@ -659,7 +659,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
-             break;
-         }
-     }
--#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
- 
-     return ret;
- }
-@@ -667,7 +667,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
- QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
- {
-     QVariant ret;
--#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     switch (ippGetValueTag(attr)) {
-     case IPP_TAG_INTEGER:
-     case IPP_TAG_ENUM:
-@@ -760,7 +760,7 @@ QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
-             ret = values;
-         }
-     }
--#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     return ret;
- }
- 
diff --git a/kde-base/qguiplatformplugin_kde/Manifest b/kde-base/qguiplatformplugin_kde/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/qguiplatformplugin_kde/Manifest
+++ b/kde-base/qguiplatformplugin_kde/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.9.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.9.ebuild
deleted file mode 100644
index 3ec34b169709..000000000000
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.9.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.9.ebuild,v 1.4 2014/05/08 07:32:12 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/qtruby/qtruby-4.14.3-r1.ebuild b/kde-base/qtruby/qtruby-4.14.3-r1.ebuild
deleted file mode 100644
index c91ea09a82e8..000000000000
--- a/kde-base/qtruby/qtruby-4.14.3-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.14.3-r1.ebuild,v 1.1 2014/12/02 13:05:19 mrueg Exp $
-
-EAPI=5
-
-OPENGL_REQUIRED="always"
-DECLARATIVE_REQUIRED="optional"
-KDE_REQUIRED="never"
-USE_RUBY="ruby20"
-# Only one ruby version is supported:
-# 1) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-base ruby-ng
-
-DESCRIPTION="Qt Ruby bindings"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug phonon qscintilla qwt webkit"
-HOMEPAGE="http://techbase.kde.org/Development/Languages/Ruby"
-
-DEPEND="
-	$(add_kdebase_dep smokeqt 'declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?')
-"
-
-RDEPEND="${DEPEND}
-"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-base_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-base_src_prepare
-}
-
-each_ruby_configure() {
-	local CMAKE_USE_DIR=${S}
-	local mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
-
-each_ruby_compile() {
-	local CMAKE_USE_DIR=${S}
-	kde4-base_src_compile
-}
-
-each_ruby_install() {
-	local CMAKE_USE_DIR=${S}
-	kde4-base_src_install
-}
diff --git a/kde-base/qtruby/qtruby-4.14.3.ebuild b/kde-base/qtruby/qtruby-4.14.3.ebuild
deleted file mode 100644
index b2bb0fab48a5..000000000000
--- a/kde-base/qtruby/qtruby-4.14.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.14.3.ebuild,v 1.3 2015/01/18 20:55:04 johu Exp $
-
-EAPI=5
-
-OPENGL_REQUIRED="always"
-DECLARATIVE_REQUIRED="optional"
-KDE_REQUIRED="never"
-USE_RUBY="ruby19"
-# Only one ruby version is supported:
-# 1) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-base ruby-ng
-
-DESCRIPTION="Qt Ruby bindings"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug phonon qscintilla qwt webkit"
-HOMEPAGE="http://techbase.kde.org/Development/Languages/Ruby"
-
-DEPEND="
-	$(add_kdebase_dep smokeqt 'declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?')
-"
-
-RDEPEND="${DEPEND}
-"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-base_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-base_src_prepare
-}
-
-each_ruby_configure() {
-	local CMAKE_USE_DIR=${S}
-	local mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
-
-each_ruby_compile() {
-	local CMAKE_USE_DIR=${S}
-	kde4-base_src_compile
-}
-
-each_ruby_install() {
-	local CMAKE_USE_DIR=${S}
-	kde4-base_src_install
-}
diff --git a/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild b/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
index eb628c057454..06e3f015006a 100644
--- a/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
+++ b/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild,v 1.4 2015/02/17 11:06:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild,v 1.5 2015/02/19 06:37:16 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ KDE_REQUIRED="never"
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +phonon qimageblitz qscintilla qwt webkit xmlpatterns"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Smoke"
 
diff --git a/kde-base/smokeqt/smokeqt-4.14.3.ebuild b/kde-base/smokeqt/smokeqt-4.14.3.ebuild
deleted file mode 100644
index 40a99505fdf4..000000000000
--- a/kde-base/smokeqt/smokeqt-4.14.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.14.3.ebuild,v 1.2 2014/12/11 13:05:50 zlogene Exp $
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="optional"
-MULTIMEDIA_REQUIRED="optional"
-QTHELP_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-KDE_REQUIRED="never"
-
-inherit kde4-base
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +phonon qimageblitz qscintilla qwt webkit"
-HOMEPAGE="http://techbase.kde.org/Development/Languages/Smoke"
-
-# Maybe make more of Qt optional?
-DEPEND="
-	$(add_kdebase_dep smokegen)
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	dev-qt/qttest:4
-	phonon? ( media-libs/phonon[qt4] )
-	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
-	qscintilla? ( x11-libs/qscintilla:= )
-	qwt? ( x11-libs/qwt:5[svg] )
-	webkit? ( dev-qt/qtwebkit:4 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_Qt3Support=ON
-		-DWITH_QT3_SUPPORT=OFF
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qthelp QtHelp)
-		$(cmake-utils_use_disable qwt Qwt5)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/solid-actions-kcm/Manifest b/kde-base/solid-actions-kcm/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/solid-actions-kcm/Manifest
+++ b/kde-base/solid-actions-kcm/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.9.ebuild b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.9.ebuild
deleted file mode 100644
index 9af70f1f37b3..000000000000
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.9.ebuild,v 1.5 2014/05/08 07:33:01 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="KDE control module for Solid actions"
-HOMEPAGE="http://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep solid-runtime)
-	!kde-base/solid:4
-"
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index 912032620d69..1567544483d4 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -1,2 +1 @@
 DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
-DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
diff --git a/kde-base/systemsettings/systemsettings-4.11.9-r1.ebuild b/kde-base/systemsettings/systemsettings-4.11.9-r1.ebuild
deleted file mode 100644
index bea2ddd49bd3..000000000000
--- a/kde-base/systemsettings/systemsettings-4.11.9-r1.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/kde-base/systemsettings/systemsettings-4.11.9-r1.ebuild,v 1.1 2014/05/13 17:43:05 johu Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-HOMEPAGE+=" http://userbase.kde.org/System_Settings"
-IUSE="debug gtk nepomuk +usb"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	app-misc/strigi
-	dev-libs/glib:2
-	$(add_kdebase_dep kwin)
-	$(add_kdebase_dep libkworkspace)
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=x11-libs/libxklavier-3.2
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	usb? ( virtual/libusb:0 )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/kbproto
-	x11-proto/xextproto
-"
-RDEPEND="${COMMONDEPEND}
-	sys-libs/timezone-data
-	x11-apps/setxkbmap
-	x11-misc/xkeyboard-config
-	gtk? ( kde-misc/kde-gtk-config )
-	nepomuk? ( $(add_kdebase_dep nepomuk) )
-"
-
-KMEXTRA="
-	kcontrol/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.kde.krunner.App.xml
-	krunner/dbus/org.kde.screensaver.xml
-	ksmserver/screenlocker/dbus/org.kde.screensaver.xml
-	kwin/
-	libs/
-	plasma/
-"
-# fails to connect to a kded instance
-RESTRICT="test"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kcontrol
-			doc/kfontview
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
-		systemsettings/CMakeLists.txt \
-		|| die "Failed to fix systemsettingsrc install location"
-
-	kde4-meta_src_prepare
-}
-
-# FIXME: is have_openglxvisual found without screensaver
-src_configure() {
-	# Old keyboard-detection code is unmaintained,
-	# so we force the new stuff, using libxklavier.
-	mycmakeargs=(
-		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
-		-DWITH_GLIB2=ON -DWITH_GObject=ON
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with usb)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/systemsettings/systemsettings-4.11.9.ebuild b/kde-base/systemsettings/systemsettings-4.11.9.ebuild
deleted file mode 100644
index 0888f2944d06..000000000000
--- a/kde-base/systemsettings/systemsettings-4.11.9.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/kde-base/systemsettings/systemsettings-4.11.9.ebuild,v 1.5 2014/05/08 07:32:07 ago Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-HOMEPAGE+=" http://userbase.kde.org/System_Settings"
-IUSE="debug gtk semantic-desktop +usb"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	app-misc/strigi
-	dev-libs/glib:2
-	$(add_kdebase_dep kwin)
-	$(add_kdebase_dep libkworkspace)
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=x11-libs/libxklavier-3.2
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	usb? ( virtual/libusb:0 )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/kbproto
-	x11-proto/xextproto
-"
-RDEPEND="${COMMONDEPEND}
-	sys-libs/timezone-data
-	x11-apps/setxkbmap
-	x11-misc/xkeyboard-config
-	gtk? ( kde-misc/kde-gtk-config )
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-"
-
-KMEXTRA="
-	kcontrol/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.kde.krunner.App.xml
-	krunner/dbus/org.kde.screensaver.xml
-	ksmserver/screenlocker/dbus/org.kde.screensaver.xml
-	kwin/
-	libs/
-	plasma/
-"
-# fails to connect to a kded instance
-RESTRICT="test"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kcontrol
-			doc/kfontview
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
-		systemsettings/CMakeLists.txt \
-		|| die "Failed to fix systemsettingsrc install location"
-
-	kde4-meta_src_prepare
-}
-
-# FIXME: is have_openglxvisual found without screensaver
-src_configure() {
-	# Old keyboard-detection code is unmaintained,
-	# so we force the new stuff, using libxklavier.
-	mycmakeargs=(
-		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
-		-DWITH_GLIB2=ON -DWITH_GObject=ON
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with usb)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.7.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.7.0.ebuild
index 93e25177290a..412739680a3c 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.7.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kglobalaccel/kglobalaccel-5.7.0.ebuild,v 1.2 2015/02/17 12:08:46 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kglobalaccel/kglobalaccel-5.7.0.ebuild,v 1.3 2015/02/19 08:03:16 kensington Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ RDEPEND="
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kwindowsystem X)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index b5e582e5f15a..87ab5473e813 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1 +1,2 @@
+DIST tellico-2.3.10.tar.bz2 4877384 SHA256 e916101f86b6f843b85be42e8545aa7441cd496cbb9b81590e2e0bd03a58faaa SHA512 a93300900febae996633294fa0b2e5808af62bbebafa718e0ba345f206dcd2836e44b6172621fd1b506fd3e6ae60f5c03514d0f53433188c67e6b92a058b33aa WHIRLPOOL 88ea79b081ae35a6f4bff5a34d9df2e2e85af2435e071d93697d4157e8aff638c881445bfa0f9f1bcf30807ac30280e39f08cbc4c968aee47b963b6447f65bb3
 DIST tellico-2.3.9.tar.bz2 4855832 SHA256 5184c130ea7561be6e72580105f30d5f160fd2fd5c9ffc7f7e16faf227a20114 SHA512 bb98ec5a0ce016d7a0990260a22ecbb9e74c7ec3e9013a08623b26a3528c52f597d046a8118db356bf000956bae222a1fccdd445a89abbbb731930eddcc51535 WHIRLPOOL 4e083d5ddbb1bf7b33fa1d8fc0b228e9fbc8f5f15797a78530e0713388b5548e7df785b475e1e7a291379653bfb4ce7703c30e1cf2114e1550db47966e06d5c8
diff --git a/kde-misc/tellico/tellico-2.3.10.ebuild b/kde-misc/tellico/tellico-2.3.10.ebuild
new file mode 100644
index 000000000000..796550526fce
--- /dev/null
+++ b/kde-misc/tellico/tellico-2.3.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-2.3.10.ebuild,v 1.1 2015/02/19 07:59:07 kensington Exp $
+
+EAPI=5
+
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl hu
+ia it ja kk lt mr ms nb nds nl nn pl pt pt_BR ro ru sk sl sv tr ug uk zh_CN
+zh_TW"
+KDE_MINIMAL="4.13.1"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A collection manager for the KDE environment"
+HOMEPAGE="http://tellico-project.org/"
+SRC_URI="http://tellico-project.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="addressbook cddb debug nepomuk pdf scanner taglib v4l xmp yaz"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/qjson
+	dev-qt/qtdbus:4
+	media-libs/qimageblitz
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	cddb? ( $(add_kdebase_dep libkcddb) )
+	nepomuk? ( $(add_kdebase_dep kdelibs 'nepomuk?') )
+	pdf? ( app-text/poppler[qt4] )
+	scanner? ( $(add_kdebase_dep libksane) )
+	taglib? ( >=media-libs/taglib-1.5 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2 )
+	yaz? ( >=dev-libs/yaz-2 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+# tests need network access and well-defined server responses
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		$(cmake-utils_use_with cddb KdeMultimedia)
+		$(cmake-utils_use_with pdf PopplerQt4)
+		$(cmake-utils_use_with nepomuk)
+		$(cmake-utils_use_with scanner KSane)
+		$(cmake-utils_use_with taglib)
+		$(cmake-utils_use_enable v4l WEBCAM)
+		$(cmake-utils_use_with xmp Exempi)
+		$(cmake-utils_use_with yaz)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
index 5d9be24a68aa..ac63372d37dd 100644
--- a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild,v 1.4 2015/02/17 21:00:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild,v 1.5 2015/02/19 09:08:14 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://lxde.sf.net/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~ppc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ppc ~x86 ~arm-linux ~x86-linux"
 SLOT="0"
 # upower USE flag is enabled by default in the desktop profile
 IUSE="nls upower"
diff --git a/media-gfx/comix/comix-4.0.4-r1.ebuild b/media-gfx/comix/comix-4.0.4-r1.ebuild
index f0dbf05d3611..085772c743eb 100644
--- a/media-gfx/comix/comix-4.0.4-r1.ebuild
+++ b/media-gfx/comix/comix-4.0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/comix/comix-4.0.4-r1.ebuild,v 1.2 2014/08/10 21:13:44 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comix/comix-4.0.4-r1.ebuild,v 1.3 2015/02/19 09:07:08 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="rar"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild b/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild
index 4eaed0998ec1..d3fe8c0861dc 100644
--- a/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild
+++ b/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild,v 1.1 2014/03/21 20:58:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild,v 1.2 2015/02/19 09:05:31 ago Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://kde/stable/${KDE_VERSION}/src/extragear/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="debug +handbook"
 
 DEPEND="media-libs/imlib
diff --git a/media-libs/libepoxy/libepoxy-1.2.ebuild b/media-libs/libepoxy/libepoxy-1.2.ebuild
index 2bd871eefc3a..10403af89fa1 100644
--- a/media-libs/libepoxy/libepoxy-1.2.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libepoxy/libepoxy-1.2.ebuild,v 1.6 2015/02/18 15:56:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libepoxy/libepoxy-1.2.ebuild,v 1.8 2015/02/19 09:01:43 ago Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
 	KEYWORDS=""
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/mesa/mesa-10.3.7-r1.ebuild b/media-libs/mesa/mesa-10.3.7-r1.ebuild
index ee159d9f8244..200945018c75 100644
--- a/media-libs/mesa/mesa-10.3.7-r1.ebuild
+++ b/media-libs/mesa/mesa-10.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.7-r1.ebuild,v 1.2 2015/02/18 15:56:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.7-r1.ebuild,v 1.3 2015/02/19 08:51:26 ago Exp $
 
 EAPI=5
 
@@ -39,7 +39,7 @@ fi
 # GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
 LICENSE="MIT SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~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 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 INTEL_CARDS="i915 i965 ilo intel"
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest
index 9fe554ea7049..9a436f4e2348 100644
--- a/media-libs/sge/Manifest
+++ b/media-libs/sge/Manifest
@@ -1 +1 @@
-DIST sge030809.tar.gz 251698 RMD160 c3c2484e27e9ddce754cc9471720a7c33becbbc3 SHA1 c7da60e837d685f6024074298e9f7e6eb76ea860 SHA256 25cfbe59ab99647254e69d25984707045492c2a5d1b15f27d999d0284a7110fc
+DIST sge030809.tar.gz 251698 SHA256 25cfbe59ab99647254e69d25984707045492c2a5d1b15f27d999d0284a7110fc SHA512 59144d573f254cc451a22a2d60ba68c7d9437b5095f63fc7ec36c21c3caf7580c5365267a004e08b9d08cf187a59ddefb76a5829f4a6aa1ff4d45f7d044bb2fb WHIRLPOOL 627a67c5092fe1e3c313b9fa3588ad28f2d10a9dccbce2705847274f33195579f2e98e39f2ef1c7a82c80d8cb32a02ebf31ee9822f0975de3de19b4ce427db0d
diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index a217f68e2045..7fd6976ef038 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sge/sge-030809.ebuild,v 1.12 2008/07/27 08:17:00 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sge/sge-030809.ebuild,v 1.13 2015/02/19 09:21:35 mr_bones_ Exp $
 
-inherit eutils multilib
+EAPI=5
+inherit eutils multilib toolchain-funcs
 
 MY_P="sge${PV}"
 DESCRIPTION="Graphics extensions library for SDL"
@@ -20,37 +21,36 @@ DEPEND="media-libs/libsdl
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-build.patch \
 		"${FILESDIR}"/${P}-freetype.patch \
 		"${FILESDIR}"/${P}-cmap.patch
-	sed -i "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
+	sed -i "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" Makefile || die
+	sed -i \
+		-e '/^CC=/d' \
+		-e '/^CXX=/d' \
+		-e '/^AR=/d' \
+		Makefile.conf || die
+	tc-export CC CXX AR
 	# make sure the header gets regenerated everytime
 	rm -f sge_config.h
+}
 
-	yesno() { use $1 && echo y || echo n ; }
+src_compile() {
 	emake \
-		USE_IMG=$(yesno image) \
-		USE_FT=$(yesno truetype) \
-		|| die "emake failed"
+		USE_IMG=$(usex image y n) \
+		USE_FT=$(usex truetype y n)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README Todo WhatsNew
+	DOCS="README Todo WhatsNew" \
+		default
 
 	use doc && dohtml docs/*
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
+		doins -r examples
 	fi
 }
diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild
index 7efb7449f168..f8da55180263 100644
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r2.ebuild,v 1.5 2015/02/06 14:09:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r2.ebuild,v 1.6 2015/02/19 09:07:54 ago Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~x86"
 
 IUSE="aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices
 jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
index 86aca17f8da4..77c9896078b2 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ffdiaporama-2.1.ebuild,v 1.4 2015/02/15 19:56:41 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ffdiaporama-2.1.ebuild,v 1.5 2015/02/19 09:07:03 ago Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ LICENSE="GPL-2
 	openclipart? ( CC0-1.0 )
 	texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4b9821319858..01a748adb200 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Feb 2015 19:06:51 +0000
+Thu, 19 Feb 2015 13:06:50 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4b9821319858..01a748adb200 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Feb 2015 19:06:51 +0000
+Thu, 19 Feb 2015 13:06:50 +0000
diff --git a/metadata/md5-cache/app-admin/kedpm-0.4.0-r2 b/metadata/md5-cache/app-admin/kedpm-0.4.0-r2
index 435a4b9c2ae4..8c7899d6d090 100644
--- a/metadata/md5-cache/app-admin/kedpm-0.4.0-r2
+++ b/metadata/md5-cache/app-admin/kedpm-0.4.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Ked Password Manager helps to manage large amounts of passwords and
 EAPI=5
 HOMEPAGE=http://kedpm.sourceforge.net/
 IUSE=gtk python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2[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://sourceforge/kedpm/kedpm-0.4.0.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=4e3c79b0a1d2645ba8f9b1cbf3cb9955
+_md5_=fb7755b5ecc81fc62a114cf57254032f
diff --git a/metadata/md5-cache/app-arch/dpkg-1.17.23 b/metadata/md5-cache/app-arch/dpkg-1.17.23
index 3b42b1659c24..734d64a5298b 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.17.23
+++ b/metadata/md5-cache/app-arch/dpkg-1.17.23
@@ -4,10 +4,10 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/dpkg
 IUSE=+bzip2 +lzma nls selinux 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 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.17.23.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=80ea1e5f9cd7af7d0b6a57fee1d1639d
+_md5_=86210e22d2fa0a8cdf37a90e1c90e487
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha17 b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha17
index 8cc7ee272d6a..6159f167ca33 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha17
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha17
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=acl? ( virtual/acl ) filecaps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 ) filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 ) filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
 DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/cdrtools/
-IUSE=acl nls unicode +filecaps
+IUSE=acl caps nls unicode +filecaps
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
-RDEPEND=acl? ( virtual/acl ) filecaps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.01a17.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fcaps	eeefea88d5fef2853d4c1e3770340302	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=21bb98578f761d341aca21565b36dc3e
+_md5_=ac51a7d8d5b8473e295dcfba00984285
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha24 b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha24
index f48d993e1d36..2376c35abdd1 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha24
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha24
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=acl? ( virtual/acl ) filecaps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 ) filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 ) filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
 DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/cdrtools/
-IUSE=acl nls unicode +filecaps
+IUSE=acl caps nls unicode +filecaps
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
-RDEPEND=acl? ( virtual/acl ) filecaps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.01a24.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fcaps	eeefea88d5fef2853d4c1e3770340302	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=650a64cfb2a6c260727bc3edba234436
+_md5_=9e514df4ff19feef2740651acf5698bc
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha27 b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha27
index 6448b77e4ddf..bf05c10c47e1 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha27
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha27
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=acl? ( virtual/acl ) filecaps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 ) filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 ) filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
 DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/cdrtools/
-IUSE=acl nls unicode +filecaps
+IUSE=acl caps nls unicode +filecaps
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
-RDEPEND=acl? ( virtual/acl ) filecaps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.01a27.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fcaps	eeefea88d5fef2853d4c1e3770340302	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8583c9e7c39f1034dacb05f213a30dad
+_md5_=e25c952a472e1a93811a42d09e62f229
diff --git a/metadata/md5-cache/app-cdr/cdw-0.8.0 b/metadata/md5-cache/app-cdr/cdw-0.8.0
new file mode 100644
index 000000000000..ddf32db87290
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdw-0.8.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
+DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
+EAPI=5
+HOMEPAGE=http://cdw.sourceforge.net
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/cdw/cdw-0.8.0.tar.gz
+_md5_=ac642bb84bdf69bc104a6ab7ddf647fe
diff --git a/metadata/md5-cache/app-cdr/cdw-9999 b/metadata/md5-cache/app-cdr/cdw-9999
index 26e7a3cb2c34..a6a7b2a653e3 100644
--- a/metadata/md5-cache/app-cdr/cdw-9999
+++ b/metadata/md5-cache/app-cdr/cdw-9999
@@ -1,10 +1,9 @@
 DEFINED_PHASES=install prepare unpack
 DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/cvs
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
-EAPI=2
+EAPI=5
 HOMEPAGE=http://cdw.sourceforge.net
 LICENSE=GPL-2
-RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
 SLOT=0
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	cvs	a4cb8da1bb586b224ade5b54f1d2fda0	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=4212cb4692c154363a93242832086b1e
+_md5_=058f766079f2636245a5cf843d1c6bb5
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.9.0 b/metadata/md5-cache/app-crypt/pinentry-0.9.0
index e3e3b6039761..bfd5204556a8 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.9.0
+++ b/metadata/md5-cache/app-crypt/pinentry-0.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize t
 EAPI=5
 HOMEPAGE=http://gnupg.org/aegypten2/index.html
 IUSE=gtk ncurses qt4 caps static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~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=GPL-2
 RDEPEND=app-admin/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
 REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5e3e0de47d0cd47b8aa283c6d6e76ea7
+_md5_=df46ab2cc2da999ac7af5260528267ec
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r5 b/metadata/md5-cache/app-editors/nvi-1.81.6-r5
new file mode 100644
index 000000000000..77de98467b99
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nvi-1.81.6-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2 perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Vi clone
+EAPI=4
+HOMEPAGE=https://sites.google.com/a/bostic.com/keithbostic/vi
+IUSE=perl tcl unicode
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2 perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) ) app-admin/eselect-vi
+REQUIRED_USE=tcl? ( !unicode )
+SLOT=0
+SRC_URI=http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e185d102b534b5dbc5759729b271998f
diff --git a/metadata/md5-cache/app-emulation/docker-1.3.3-r1 b/metadata/md5-cache/app-emulation/docker-1.3.3-r1
deleted file mode 100644
index d36111524cb1..000000000000
--- a/metadata/md5-cache/app-emulation/docker-1.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) >=dev-lang/go-1.3 <dev-lang/go-1.4 btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Docker complements kernel namespacing with a high-level API which operates at the process level
-EAPI=5
-HOMEPAGE=https://www.docker.com
-IUSE=aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 lxc? ( >=app-emulation/lxc-1.0 ) aufs? ( || ( sys-fs/aufs3 sys-kernel/aufs-sources ) )
-RESTRICT=installsources strip
-SLOT=0
-SRC_URI=https://github.com/docker/docker/archive/v1.3.3.tar.gz -> docker-1.3.3.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c922f0c016e607145f41a631b7d911be
diff --git a/metadata/md5-cache/app-emulation/docker-1.4.1 b/metadata/md5-cache/app-emulation/docker-1.4.1
deleted file mode 100644
index e3acff7f9e3a..000000000000
--- a/metadata/md5-cache/app-emulation/docker-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) >=dev-lang/go-1.3 <dev-lang/go-1.4 btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Docker complements kernel namespacing with a high-level API which operates at the process level
-EAPI=5
-HOMEPAGE=https://www.docker.com
-IUSE=aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 lxc? ( >=app-emulation/lxc-1.0 ) aufs? ( || ( sys-fs/aufs3 sys-kernel/aufs-sources ) )
-RESTRICT=installsources strip
-SLOT=0
-SRC_URI=https://github.com/docker/docker/archive/v1.4.1.tar.gz -> docker-1.4.1.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7a8b5da7b9ab496e9d1b1b5d4644fbb9
diff --git a/metadata/md5-cache/app-forensics/lynis-1.6.4 b/metadata/md5-cache/app-forensics/lynis-1.6.4
index 2c136e08c4a8..cd0e1b48458e 100644
--- a/metadata/md5-cache/app-forensics/lynis-1.6.4
+++ b/metadata/md5-cache/app-forensics/lynis-1.6.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Security and system auditing tool
 EAPI=5
 HOMEPAGE=http://cisofy.com/lynis/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=http://cisofy.com/files/lynis-1.6.4.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=03a5552c4f5ab4c563f3719719f97f2e
+_md5_=ea6efaa3e030c72e6fe5ce64aba31c1d
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.11 b/metadata/md5-cache/app-misc/hivex-1.3.11
index 0cda10de552b..93de21b689dd 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.11
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby20? ( ruby? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( ruby? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl[-build(-)]
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby20? ( ruby? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( ruby? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) dev-lang/perl[-build(-)]
 DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
 EAPI=5
 HOMEPAGE=http://libguestfs.org
@@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	6b84915e66050718c89bcbc76c144e80	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8b8dbe07d7c2a6988a64453b73e776f3
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	6b84915e66050718c89bcbc76c144e80	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=7f619fc66e7fdb2efad5b0d44e36c2d1
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.2-r2 b/metadata/md5-cache/app-misc/hivex-1.3.2-r2
deleted file mode 100644
index 0c259b80f8cc..000000000000
--- a/metadata/md5-cache/app-misc/hivex-1.3.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl[-build(-)] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
-EAPI=5
-HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline perl python test static-libs ruby
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build(-)] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-SLOT=0
-SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.2.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	6b84915e66050718c89bcbc76c144e80	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=2ef986e9ef972265a5fd1db3148ba985
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.7-r1 b/metadata/md5-cache/app-misc/hivex-1.3.7-r1
deleted file mode 100644
index 21d4e92c089a..000000000000
--- a/metadata/md5-cache/app-misc/hivex-1.3.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby19? ( ruby? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( ruby? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl[-build(-)] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
-EAPI=5
-HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) dev-lang/perl[-build(-)] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-SLOT=0
-SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.7.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	6b84915e66050718c89bcbc76c144e80	python	cd022f89fef846d083fc994b9e3d8c04	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eaffefa9e8005dba13710ecccfb60338
diff --git a/metadata/md5-cache/app-misc/pystopwatch-2012.12.24.1-r1 b/metadata/md5-cache/app-misc/pystopwatch-2012.12.24.1-r1
index 249d7a7d52c5..824e87fca7fa 100644
--- a/metadata/md5-cache/app-misc/pystopwatch-2012.12.24.1-r1
+++ b/metadata/md5-cache/app-misc/pystopwatch-2012.12.24.1-r1
@@ -3,11 +3,11 @@ DESCRIPTION=clock and two countdown functions that can minimize to the tray
 EAPI=5
 HOMEPAGE=http://xyne.archlinux.ca/projects/pystopwatch
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/librsvg >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://xyne.archlinux.ca/projects/pystopwatch/src/pystopwatch-2012.12.24.1.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cb24c6cda09ae6588c4d59fc52005f38
+_md5_=3e124d6e7c54359a2d55b6e825c37323
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.31 b/metadata/md5-cache/app-officeext/ooofbtools-2.31
index 1b3554d087f8..bc93a4546c7c 100644
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.31
+++ b/metadata/md5-cache/app-officeext/ooofbtools-2.31
@@ -4,11 +4,11 @@ DESCRIPTION=Extension for converting and processing eBooks in FictionBook2 forma
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/fbtools/
 IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
 SLOT=0
 SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.31.zip
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	office-ext-r1	370fdf6c0ffd835405efe2e8e16d1771	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6405711de6cacc0547adfd8573fbd460
+_md5_=0e64041dd66cc115ed97f792951c53cc
diff --git a/metadata/md5-cache/app-text/pandoc-1.12 b/metadata/md5-cache/app-text/pandoc-1.12
index 8b5a60b756e3..d7f2aa78619a 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12
+++ b/metadata/md5-cache/app-text/pandoc-1.12
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/stringable-0.1:=[profile?] <dev-haskell/stringable-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) >=dev-haskell/cabal-1.10.0.0 dev-haskell/alex dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/stringable-0.1:=[profile?] <dev-haskell/stringable-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) >=dev-haskell/cabal-1.10.0.0 dev-haskell/alex dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +http-conduit doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/stringable-0.1:=[profile?] <dev-haskell/stringable-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/stringable-0.1:=[profile?] <dev-haskell/stringable-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 SLOT=0/1.12
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12/pandoc-1.12.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=781c534ebd37f3cb2c4fe73d948dc433
+_md5_=c422a6d41285226d3b365062fdc5b593
diff --git a/metadata/md5-cache/app-text/pandoc-1.12.1 b/metadata/md5-cache/app-text/pandoc-1.12.1
index 3b0d86d899f0..550729d18085 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12.1
+++ b/metadata/md5-cache/app-text/pandoc-1.12.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10.0.0 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10.0.0 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +http-conduit doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 SLOT=0/1.12.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.1/pandoc-1.12.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=53cf3b48db5f3ca3f6519d2d38ad5643
+_md5_=9bb80f6bd68e53b30966b4b23eb2b1e6
diff --git a/metadata/md5-cache/app-text/pandoc-1.12.2.1 b/metadata/md5-cache/app-text/pandoc-1.12.2.1
index 98f1f05e504b..9a4266746330 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12.2.1
+++ b/metadata/md5-cache/app-text/pandoc-1.12.2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.5.2:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10.0.0 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.5.2:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10.0.0 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +http-conduit doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.5.2:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.5.2:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 SLOT=0/1.12.2.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.2.1/pandoc-1.12.2.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=aec11ee9a723cf532329c1cf5f7c9c98
+_md5_=43539cff775e1720bace080107896ce7
diff --git a/metadata/md5-cache/app-text/pandoc-1.12.3.1 b/metadata/md5-cache/app-text/pandoc-1.12.3.1
index 4070644c8c17..b3eef7289d8b 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12.3.1
+++ b/metadata/md5-cache/app-text/pandoc-1.12.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.6:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10.0.0 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.6:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10.0.0 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +http-conduit doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.6:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.6:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 SLOT=0/1.12.3.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.3.1/pandoc-1.12.3.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=37e910d0334e14bafb42823139db19e7
+_md5_=58dca7ed3cb3539bdb8e6b9181f2ce6f
diff --git a/metadata/md5-cache/app-text/pandoc-1.12.3.3 b/metadata/md5-cache/app-text/pandoc-1.12.3.3
index 1cdf8049353c..9028b815f30a 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12.3.3
+++ b/metadata/md5-cache/app-text/pandoc-1.12.3.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.6:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10.0.0 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.6:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10.0.0 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +http-conduit doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.6:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.6:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 SLOT=0/1.12.3.3
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.3.3/pandoc-1.12.3.3.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=616094be33f916ebae494a2c6584fbab
+_md5_=0b98bf300230806a8cd6904a15702a09
diff --git a/metadata/md5-cache/app-text/pandoc-1.12.4 b/metadata/md5-cache/app-text/pandoc-1.12.4
index dd7eecb78a7a..cf631bd398db 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12.4
+++ b/metadata/md5-cache/app-text/pandoc-1.12.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.7:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/highlighting-kate-0.5.7 <dev-haskell/highlighting-kate-0.6 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/syb-0.1 <dev-haskell/syb-0.5 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/text-0.11 <dev-haskell/text-1.2 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.7:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/highlighting-kate-0.5.7 <dev-haskell/highlighting-kate-0.6 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/syb-0.1 <dev-haskell/syb-0.5 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/text-0.11 <dev-haskell/text-1.2 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +http-conduit doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.7:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.7:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 RESTRICT=test
 SLOT=0/1.12.4
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.4/pandoc-1.12.4.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6955d5b1a3e8fbbb91f162cf57f8f2e2
+_md5_=df8181bf7efc213b4c859167390dc3eb
diff --git a/metadata/md5-cache/app-text/pandoc-1.12.4.2-r1 b/metadata/md5-cache/app-text/pandoc-1.12.4.2-r1
index 9329e04556b2..aa3452ab4030 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12.4.2-r1
+++ b/metadata/md5-cache/app-text/pandoc-1.12.4.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/highlighting-kate-0.5.8 <dev-haskell/highlighting-kate-0.6 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/syb-0.1 <dev-haskell/syb-0.5 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/text-0.11 <dev-haskell/text-1.2 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/highlighting-kate-0.5.8 <dev-haskell/highlighting-kate-0.6 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/syb-0.1 <dev-haskell/syb-0.5 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/text-0.11 <dev-haskell/text-1.2 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +http-conduit doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 RESTRICT=test
 SLOT=0/1.12.4.2
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.4.2/pandoc-1.12.4.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2a17a5674cb39f1452dc9fcb35236237
+_md5_=1d87bcca4a1383ef8e6224202b97c63d
diff --git a/metadata/md5-cache/app-text/pandoc-1.13.1-r3 b/metadata/md5-cache/app-text/pandoc-1.13.1-r3
index 2726e21fa6c0..d0e5b08ec9e8 100644
--- a/metadata/md5-cache/app-text/pandoc-1.13.1-r3
+++ b/metadata/md5-cache/app-text/pandoc-1.13.1-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +https make-pandoc-man-pages +network-uri trypandoc doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
+RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
 SLOT=0/1.13.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.13.1/pandoc-1.13.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5c16f6e6472b4cb5b2655fd6172ad211
+_md5_=eddbff33a66a391866ba9c8bcd54335d
diff --git a/metadata/md5-cache/app-text/pandoc-1.13.2 b/metadata/md5-cache/app-text/pandoc-1.13.2
index e8f05e627a22..0a883772c611 100644
--- a/metadata/md5-cache/app-text/pandoc-1.13.2
+++ b/metadata/md5-cache/app-text/pandoc-1.13.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +https make-pandoc-man-pages +network-uri trypandoc doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
+RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
 SLOT=0/1.13.2
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.13.2/pandoc-1.13.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c47b89fef5dfad994d3b135c63b08a4f
+_md5_=c0e52c87dc3361cabacd946367b51b82
diff --git a/metadata/md5-cache/app-text/pandoc-1.13.2-r1 b/metadata/md5-cache/app-text/pandoc-1.13.2-r1
index e9ddcac9ab3e..01693803d4d3 100644
--- a/metadata/md5-cache/app-text/pandoc-1.13.2-r1
+++ b/metadata/md5-cache/app-text/pandoc-1.13.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files +https make-pandoc-man-pages +network-uri trypandoc doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
+RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
 SLOT=0/1.13.2
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.13.2/pandoc-1.13.2.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d0b85a6cd3900f9efda06e835bc088e5
+_md5_=8693d6238488f0957898180497205b2b
diff --git a/metadata/md5-cache/dev-db/xtrabackup-bin-2.2.5 b/metadata/md5-cache/dev-db/xtrabackup-bin-2.2.5
index 227eb2abd56e..bd342ee762f5 100644
--- a/metadata/md5-cache/dev-db/xtrabackup-bin-2.2.5
+++ b/metadata/md5-cache/dev-db/xtrabackup-bin-2.2.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=MySQL hot backup software that performs non-blocking backups for InnoDB and XtraDB databases
 EAPI=5
 HOMEPAGE=http://www.percona.com/software/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 ) dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib
 SLOT=0
 SRC_URI=amd64? ( http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.2.5/binary/tarball/percona-xtrabackup-2.2.5-5027-Linux-x86_64.tar.gz ) x86? ( http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.2.5/binary/tarball/percona-xtrabackup-2.2.5-5027-Linux-i686.tar.gz )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5d82ffdc1feb1331dedacd927d3ce018
+_md5_=b28189e3ff8f3f7334a2ee92de09c2e0
diff --git a/metadata/md5-cache/dev-games/paklib-0.3 b/metadata/md5-cache/dev-games/paklib-0.3
index 74c179e0b027..f8d077ea7892 100644
--- a/metadata/md5-cache/dev-games/paklib-0.3
+++ b/metadata/md5-cache/dev-games/paklib-0.3
@@ -1,9 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=library for accessing Quake pak files
+EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/paklib/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/paklib/pak-0.3.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=30cf0b62c165068abd53a521356c9585
+_md5_=28caa31c06a6a191d36e7a7d06b3413a
diff --git a/metadata/md5-cache/dev-haskell/failure-0.2.0.3 b/metadata/md5-cache/dev-haskell/failure-0.2.0.3
index de98d1d343ae..a54a93fa5303 100644
--- a/metadata/md5-cache/dev-haskell/failure-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/failure-0.2.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A simple type class for success/failure computations. (deprecated)
 EAPI=5
 HOMEPAGE=http://www.haskell.org/haskellwiki/Failure
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0.3
 SRC_URI=mirror://hackage/packages/archive/failure/0.2.0.3/failure-0.2.0.3.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3f353b2da39043c83306912013b4e72b
+_md5_=6e3edcc2fe150680c4dafae3f7d7a529
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.5.0.1 b/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
index 38d98fc3f893..a60b6abb9745 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
+++ b/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Martin Erwig's Functional Graph Library
 EAPI=5
 HOMEPAGE=http://web.engr.oregonstate.edu/~erwig/fgl/haskell
 IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/5.5.0.1
 SRC_URI=mirror://hackage/packages/archive/fgl/5.5.0.1/fgl-5.5.0.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=51426bf0b12f2db5c619682e6df6b033
+_md5_=a9ab2df4650da1dffbc071ccef2e56bb
diff --git a/metadata/md5-cache/dev-haskell/file-embed-0.0.7 b/metadata/md5-cache/dev-haskell/file-embed-0.0.7
index 4fc7a309afdb..cc21dfe5f99d 100644
--- a/metadata/md5-cache/dev-haskell/file-embed-0.0.7
+++ b/metadata/md5-cache/dev-haskell/file-embed-0.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Use Template Haskell to embed file contents directly
 EAPI=5
 HOMEPAGE=https://github.com/snoyberg/file-embed
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.7
 SRC_URI=mirror://hackage/packages/archive/file-embed/0.0.7/file-embed-0.0.7.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c7db75975800e7fce9d472ece54e2cee
+_md5_=f1ca92eb5f6af1531f0b92b0b97f399f
diff --git a/metadata/md5-cache/dev-haskell/gnuidn-0.2.1 b/metadata/md5-cache/dev-haskell/gnuidn-0.2.1
index 3873b5596663..1249cd09d071 100644
--- a/metadata/md5-cache/dev-haskell/gnuidn-0.2.1
+++ b/metadata/md5-cache/dev-haskell/gnuidn-0.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Bindings for GNU IDN
 EAPI=5
 HOMEPAGE=https://john-millikin.com/software/haskell-gnuidn/
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= net-dns/libidn
 SLOT=0/0.2.1
 SRC_URI=mirror://hackage/packages/archive/gnuidn/0.2.1/gnuidn-0.2.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=736b8c37c57a83592709fddd047f4576
+_md5_=544683c2504900e9c3b4223b23f4d613
diff --git a/metadata/md5-cache/dev-haskell/hsb2hs-0.2 b/metadata/md5-cache/dev-haskell/hsb2hs-0.2
new file mode 100644
index 000000000000..11e6295c0e51
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hsb2hs-0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.6 >dev-haskell/preprocessor-tools-1.0 >=dev-lang/ghc-7.4.1 >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Preprocesses a file, adding blobs from files as string literals
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/hsb2hs
+KEYWORDS=amd64 x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hsb2hs/0.2/hsb2hs-0.2.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2e64253e11aac0612e269e12a9713840
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.20.3-r1 b/metadata/md5-cache/dev-haskell/hscolour-1.20.3-r1
index 8a7e13d48a09..5d257123f6da 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.20.3-r1
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.20.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Colourise Haskell code
 EAPI=5
 HOMEPAGE=http://code.haskell.org/~malcolm/hscolour/
 IUSE=doc profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.20.3
 SRC_URI=mirror://hackage/packages/archive/hscolour/1.20.3/hscolour-1.20.3.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=72e3961263430eb15a6010e103599bb1
+_md5_=939225c9c9725719b1ce680bf6f58eb6
diff --git a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.2 b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.2
index 7a7fdbfbcb13..9b28ac86631f 100644
--- a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.2
+++ b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Monad classes, using type families
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/monads-tf
 IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.2
 SRC_URI=mirror://hackage/packages/archive/monads-tf/0.1.0.2/monads-tf-0.1.0.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ba214d9cdb48e1c3a7e1b49e1050917d
+_md5_=bcbc83ea7ffefd454800927c447dc77a
diff --git a/metadata/md5-cache/dev-haskell/nanospec-0.2.0 b/metadata/md5-cache/dev-haskell/nanospec-0.2.0
index fa28f3c5bd8d..ef04b0902fb9 100644
--- a/metadata/md5-cache/dev-haskell/nanospec-0.2.0
+++ b/metadata/md5-cache/dev-haskell/nanospec-0.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight implementation of a subset of Hspec's API
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/nanospec
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0
 SRC_URI=mirror://hackage/packages/archive/nanospec/0.2.0/nanospec-0.2.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9f0589b44b0d867f0e6bb1df49227cfa
+_md5_=13814bd2b8e2ee1a7142e10671945534
diff --git a/metadata/md5-cache/dev-haskell/preprocessor-tools-1.0.1 b/metadata/md5-cache/dev-haskell/preprocessor-tools-1.0.1
new file mode 100644
index 000000000000..db35ae5a0afe
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/preprocessor-tools-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A framework for extending Haskell's syntax via quick-and-dirty preprocessors
+EAPI=5
+HOMEPAGE=http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1
+SRC_URI=mirror://hackage/packages/archive/preprocessor-tools/1.0.1/preprocessor-tools-1.0.1.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ccf8bd54848353bcfcba026d120f4aa0
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-io-0.1.1-r1 b/metadata/md5-cache/dev-haskell/quickcheck-io-0.1.1-r1
index 41caace9175b..ea1ec0a49478 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-io-0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-io-0.1.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Use HUnit assertions as QuickCheck properties
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/quickcheck-io
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/quickcheck-io/0.1.1/quickcheck-io-0.1.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e8c267eaf9b722dcc9a6598fc736b670
+_md5_=f0cd512d6c9d12d26c152b1bf35decb2
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.0 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.0
index f32bc80e47a2..3d76ffff1f6f 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.0
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/regex-tdfa
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/regex-tdfa/1.2.0/regex-tdfa-1.2.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=38b813183991a92c7446eae9906773fb
+_md5_=419f41f6a776cd6667487bf1ae251e4f
diff --git a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1 b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
index 35a394a7d497..b5465180c4ac 100644
--- a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
+++ b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=Much safer replacement for QSemN, QSem, and SampleVar
 EAPI=5
 HOMEPAGE=https://github.com/ChrisKuklewicz/SafeSemaphore
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.1
 SRC_URI=mirror://hackage/packages/archive/SafeSemaphore/0.10.1/SafeSemaphore-0.10.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5f9ed546ef76014f947f5f766f40214a
+_md5_=09771d424242e8199180c957a5224ccf
diff --git a/metadata/md5-cache/dev-haskell/text-icu-0.6.3.7-r1 b/metadata/md5-cache/dev-haskell/text-icu-0.6.3.7-r1
index d838bada7b2f..92f001771eb3 100644
--- a/metadata/md5-cache/dev-haskell/text-icu-0.6.3.7-r1
+++ b/metadata/md5-cache/dev-haskell/text-icu-0.6.3.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Bindings to the ICU library
 EAPI=5
 HOMEPAGE=https://github.com/bos/text-icu
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/icu:=
 SLOT=0/0.6.3.7
 SRC_URI=mirror://hackage/packages/archive/text-icu/0.6.3.7/text-icu-0.6.3.7.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6480eaf96f7bdf5fa5286546b823df79
+_md5_=d6c6d5a580442196354096f4488f0433
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.32 b/metadata/md5-cache/dev-java/tomcat-native-1.1.32
index 94717fb4c8ba..282e29ac23f8 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.32
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.32
@@ -4,10 +4,10 @@ DESCRIPTION=Native APR library for Tomcat
 EAPI=5
 HOMEPAGE=http://tomcat.apache.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND==dev-libs/apr-1* dev-libs/openssl >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.1.32/source/tomcat-native-1.1.32-src.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7d401819ab895e9c30d451ee0e0725b1
+_md5_=69c5ea47cede389ad6d13517941b7c5a
diff --git a/metadata/md5-cache/dev-lang/clojure-1.2.0 b/metadata/md5-cache/dev-lang/clojure-1.2.0
deleted file mode 100644
index 47fc5c1cfccf..000000000000
--- a/metadata/md5-cache/dev-lang/clojure-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=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=Clojure is a dynamic programming language that targets the Java Virtual Machine
-EAPI=2
-HOMEPAGE=http://clojure.org/
-IUSE=source elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=http://github.com/downloads/clojure/clojure/clojure-1.2.0.zip
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=24b18fb271b0d882313f3d4b9c273252
diff --git a/metadata/md5-cache/dev-lang/clojure-1.3.0 b/metadata/md5-cache/dev-lang/clojure-1.3.0
deleted file mode 100644
index ea0889a6c2d2..000000000000
--- a/metadata/md5-cache/dev-lang/clojure-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=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=Clojure is a dynamic programming language that targets the Java Virtual Machine
-EAPI=2
-HOMEPAGE=http://clojure.org/
-IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.3.0 -> clojure-1.3.0.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=51eeba1f1006d140b35a6904a5a20841
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.4.2 b/metadata/md5-cache/dev-libs/boehm-gc-7.4.2
index 9bf74d106ded..052eafe86d78 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-7.4.2
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.4.2
@@ -4,9 +4,9 @@ DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=5
 HOMEPAGE=http://www.hboehm.info/gc/
 IUSE=cxx static-libs threads
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=boehm-gc
 SLOT=0
 SRC_URI=http://www.hboehm.info/gc/gc_source/gc-7.4.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3b3f71c445d04f8b74a9f8b21afc3f68
+_md5_=8515e8353f354aa013cbf1723aaf664f
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-7.4.2 b/metadata/md5-cache/dev-libs/libatomic_ops-7.4.2
index 2e60e890c867..981b1545412e 100644
--- a/metadata/md5-cache/dev-libs/libatomic_ops-7.4.2
+++ b/metadata/md5-cache/dev-libs/libatomic_ops-7.4.2
@@ -3,9 +3,9 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys
 DESCRIPTION=Implementation for atomic memory update operations
 EAPI=5
 HOMEPAGE=https://github.com/ivmai/libatomic_ops/
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT boehm-gc GPL-2+
 SLOT=0
 SRC_URI=https://github.com/ivmai/libatomic_ops/archive/libatomic_ops-7_4_2.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=98584729e176208c50e8cf4fd7c575af
+_md5_=68b5b6e9ceea536295b2a73ebc8219ce
diff --git a/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20141027 b/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20141027
index 4bd71f6d9f89..f264daa67b93 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20141027
+++ b/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20141027
@@ -3,10 +3,10 @@ DEPEND=>=sys-devel/clang-3.5 >=sys-devel/llvm-3.5 || ( >=dev-lang/python-2.7.5-r
 DESCRIPTION=OpenCL C library
 EAPI=5
 HOMEPAGE=http://libclc.llvm.org/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( MIT BSD )
 RDEPEND=>=sys-devel/clang-3.5 >=sys-devel/llvm-3.5
 SLOT=0
 SRC_URI=mirror://gentoo/libclc-0.0.1_pre20141027.tar.xz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dbe6e25966466d560e11b342f5233615
+_md5_=8a69f7cfa0b67dfeba65aae8185a3918
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.3 b/metadata/md5-cache/dev-libs/libevdev-1.3
index 912b320b9a67..20be73d1c39b 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.3
+++ b/metadata/md5-cache/dev-libs/libevdev-1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Handler library for evdev events
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/libevdev/libevdev-1.3.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=fd7a9c77aa79c9f513b8328aa02a718d
+_md5_=fc0e4a9a6525eb43eea89fdfe362db49
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.2 b/metadata/md5-cache/dev-libs/libsodium-1.0.2
index edc2618ed628..8f0394e445d6 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.2
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.2
@@ -3,9 +3,9 @@ DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
 EAPI=5
 HOMEPAGE=https://github.com/jedisct1/libsodium
 IUSE=+asm minimal static-libs +urandom
-KEYWORDS=~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
 SLOT=0/13
 SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a7a79f96627e5d918f8cfbfe35c5e247
+_md5_=eff15cd5175e87633983f43e49ef1f5d
diff --git a/metadata/md5-cache/dev-libs/wayland-1.6.1 b/metadata/md5-cache/dev-libs/wayland-1.6.1
index 26572dac521e..aa2a912e2c9a 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.6.1
+++ b/metadata/md5-cache/dev-libs/wayland-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Wayland protocol libraries
 EAPI=5
 HOMEPAGE=http://wayland.freedesktop.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.6.1.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=899b204d0fe6e43e4736586b316992c7
+_md5_=09ccf37c535eb50753efa653a908c90a
diff --git a/metadata/md5-cache/dev-libs/weston-1.6.1 b/metadata/md5-cache/dev-libs/weston-1.6.1
index 4c90ec400a09..41d72e4d88f8 100644
--- a/metadata/md5-cache/dev-libs/weston-1.6.1
+++ b/metadata/md5-cache/dev-libs/weston-1.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Wayland reference compositor
 EAPI=5
 HOMEPAGE=http://wayland.freedesktop.org/
 IUSE=colord dbus +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland test
-KEYWORDS=amd64 ~arm ~x86 ~arm-linux
+KEYWORDS=amd64 ~arm x86 ~arm-linux
 LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/wayland-1.6.0 media-libs/lcms:2 media-libs/libpng:0= media-libs/libwebp:0= virtual/jpeg >=x11-libs/cairo-1.11.3[gles2(-)?,opengl?] >=x11-libs/libdrm-2.4.30 x11-libs/libxkbcommon x11-libs/pixman x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( sys-apps/dbus ) drm? ( media-libs/mesa[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) egl? ( media-libs/glu media-libs/mesa[gles2,wayland] ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[wayland] ) opengl? ( media-libs/mesa[wayland] ) rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) rpi? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) systemd? ( sys-auth/pambase[systemd] sys-apps/systemd[pam] ) launch? ( sys-auth/pambase ) unwind? ( sys-libs/libunwind ) X? ( x11-libs/libxcb x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] x11-libs/libxcb x11-libs/libXcursor )
 REQUIRED_USE=drm? ( egl ) egl? ( || ( gles2 opengl ) ) gles2? ( !opengl ) screen-sharing? ( rdp ) test? ( X ) wayland-compositor? ( egl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://wayland.freedesktop.org/releases/weston-1.6.1.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=99273728090a42f8fbe7361bd87da7e3
+_md5_=e809c034614308ba5e4483229bf58fc5
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.10 b/metadata/md5-cache/dev-ml/cryptokit-1.10
index 5aab4f9f1606..606def812719 100644
--- a/metadata/md5-cache/dev-ml/cryptokit-1.10
+++ b/metadata/md5-cache/dev-ml/cryptokit-1.10
@@ -4,10 +4,10 @@ DESCRIPTION=Cryptographic primitives library for Objective Caml
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/cryptokit/
 IUSE=zlib +ocamlopt debug doc test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.10
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	oasis	45027e91f880d9142eec842f0cca0088	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6da88f7d58d5a1cc48ca90d99f2f73f2
+_md5_=959126b1dc82108492bc12a325445f25
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-3.7.7 b/metadata/md5-cache/dev-ml/ocamlnet-3.7.7
index 9ee0227eb998..0a9baa554ed3 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-3.7.7
+++ b/metadata/md5-cache/dev-ml/ocamlnet-3.7.7
@@ -4,11 +4,11 @@ DESCRIPTION=Modules for OCaml application-level Internet protocols
 EAPI=5
 HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
 IUSE=cryptokit gtk ssl tk httpd +ocamlopt +pcre zip
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=ZLIB GPL-2+
 RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) ) cryptokit? ( dev-ml/cryptokit:= ) gtk? ( >=dev-ml/lablgtk-2:= ) ssl? ( >=dev-ml/ocaml-ssl-0.4:= ) zip? ( dev-ml/camlzip:= )
 RESTRICT=installsources
 SLOT=0/3.7.7
 SRC_URI=http://download.camlcity.org/download/ocamlnet-3.7.7.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8e0872f8cdee0925a64e46bdc921f061
+_md5_=17dffb58d0a062abb7db6964a63b9f2f
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.6.1 b/metadata/md5-cache/dev-ml/ocurl-0.6.1
index c03744744668..12feca6d45fb 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.6.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml interface to the libcurl library
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/
 IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.6.1
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1374/ocurl-0.6.1.tgz
 _eclasses_=findlib	9cf6020ee5481f39f1aa566a323f9868
-_md5_=3b4a47d4f1727d2507bd288d823c40a1
+_md5_=4710995d2b3a4e6babf66f4af5bfc98c
diff --git a/metadata/md5-cache/dev-ml/pomap-3.0.5 b/metadata/md5-cache/dev-ml/pomap-3.0.5
index 7cae96f7ec08..74506ee33d10 100644
--- a/metadata/md5-cache/dev-ml/pomap-3.0.5
+++ b/metadata/md5-cache/dev-ml/pomap-3.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Partially Ordered Map ADT for O'Caml
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/pomap/
 IUSE=examples +ocamlopt debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/3.0.5
 SRC_URI=https://github.com/mmottl/pomap/releases/download/v3.0.5/pomap-3.0.5.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	oasis	45027e91f880d9142eec842f0cca0088	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c9112b1dfcfd10846b02b21dd0c57aeb
+_md5_=f52637824c56fc3bd8278cf1adc1cd8f
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.450.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.450.0
new file mode 100644
index 000000000000..b6ce711d1485
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.450.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=[-build(-)]
+DESCRIPTION=A wrapper that lets you read Zip archive members as if they were files
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Archive-Zip/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.45.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=bbafdf403fffaf79230a79b9f1e4c214
diff --git a/metadata/md5-cache/dev-php/suhosin-0.9.37.1 b/metadata/md5-cache/dev-php/suhosin-0.9.37.1
index dd017513cf8c..8c7a0bb0ba1f 100644
--- a/metadata/md5-cache/dev-php/suhosin-0.9.37.1
+++ b/metadata/md5-cache/dev-php/suhosin-0.9.37.1
@@ -4,11 +4,11 @@ DESCRIPTION=Suhosin is an advanced protection system for PHP installations
 EAPI=5
 HOMEPAGE=http://www.suhosin.org/
 IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php[unicode] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://download.suhosin.org/suhosin-0.9.37.1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cce36de8d51f6fa8f2aa9aacb80e0297
+_md5_=ae3209b33f544b22fd36c8f99800dbd8
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.6 b/metadata/md5-cache/dev-php/xdebug-2.2.6
index 67c4254a6ec6..9bc47b8a6df7 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.6
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=A PHP debugging and profiling extension
 EAPI=5
 HOMEPAGE=http://www.xdebug.org/
 IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Xdebug
 RDEPEND=~dev-php/xdebug-client-2.2.6 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.6.tgz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7daf79b0187bd6aa76e299272cac9d36
+_md5_=37b9163beca8470823e6ee19fa2a62b3
diff --git a/metadata/md5-cache/dev-php/xdebug-client-2.2.6 b/metadata/md5-cache/dev-php/xdebug-client-2.2.6
index 69273ebe433d..6f65d545e41a 100644
--- a/metadata/md5-cache/dev-php/xdebug-client-2.2.6
+++ b/metadata/md5-cache/dev-php/xdebug-client-2.2.6
@@ -4,9 +4,9 @@ DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP)
 EAPI=5
 HOMEPAGE=http://www.xdebug.org/
 IUSE=libedit
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+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.6.tgz
-_md5_=564e3007b9f30720d6b633ce8a0fcf18
+_md5_=4dff5793462a13ce9150b475d0184550
diff --git a/metadata/md5-cache/dev-python/Kivy-1.8.0 b/metadata/md5-cache/dev-python/Kivy-1.8.0
index 5d685e8bb90d..7a33f92346ae 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.8.0
+++ b/metadata/md5-cache/dev-python/Kivy-1.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython garden? ( dev-python/kivy-garden ) gstreamer? ( dev-python/gst-python ) cairo? ( dev-python/pycairo ) spell? ( dev-python/pyenchant ) dev-python/pygame dev-python/setuptools camera? ( media-libs/opencv ) virtual/python-imaging 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(-)]
+DEPEND=dev-python/cython garden? ( dev-python/kivy-garden ) gstreamer? ( dev-python/gst-python:1.0 ) cairo? ( dev-python/pycairo ) spell? ( dev-python/pyenchant ) dev-python/pygame dev-python/setuptools camera? ( media-libs/opencv ) virtual/python-imaging 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=A software library for rapid development of hardware-accelerated multitouch applications.
 EAPI=5
 HOMEPAGE=http://kivy.org/
 IUSE=cairo camera doc examples garden gstreamer spell python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/cython garden? ( dev-python/kivy-garden ) gstreamer? ( dev-python/gst-python ) cairo? ( dev-python/pycairo ) spell? ( dev-python/pyenchant ) dev-python/pygame dev-python/setuptools camera? ( media-libs/opencv ) virtual/python-imaging 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(-)]
+RDEPEND=dev-python/cython garden? ( dev-python/kivy-garden ) gstreamer? ( dev-python/gst-python:1.0 ) cairo? ( dev-python/pycairo ) spell? ( dev-python/pyenchant ) dev-python/pygame dev-python/setuptools camera? ( media-libs/opencv ) virtual/python-imaging python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/K/Kivy/Kivy-1.8.0.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=fa3d62b98f778b6cb71b9c0bd17f0b38
+_md5_=073e8c4e13701eab39fe279a670c5dce
diff --git a/metadata/md5-cache/dev-python/blessings-1.6 b/metadata/md5-cache/dev-python/blessings-1.6
index 208c9a55872b..d73f2ffd639a 100644
--- a/metadata/md5-cache/dev-python/blessings-1.6
+++ b/metadata/md5-cache/dev-python/blessings-1.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/blessings/blessings-1.6.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cea6b2f4858ea818837fe49dbe8e63b7
+_md5_=31b80ea4e36515a58472866cbc099fc3
diff --git a/metadata/md5-cache/dev-python/boto-2.35.1 b/metadata/md5-cache/dev-python/boto-2.35.1
index cd7baeec457e..d95fecb32ce5 100644
--- a/metadata/md5-cache/dev-python/boto-2.35.1
+++ b/metadata/md5-cache/dev-python/boto-2.35.1
@@ -4,7 +4,7 @@ DESCRIPTION=Amazon Web Services API
 EAPI=5
 HOMEPAGE=https://github.com/boto/boto http://pypi.python.org/pypi/boto
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.35.1.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e12e14b74a8b25c23d29c2648dc013f5
+_md5_=21111ce4f0861a186d31ae8bb17a2b37
diff --git a/metadata/md5-cache/dev-python/bpython-0.14 b/metadata/md5-cache/dev-python/bpython-0.14
index c4d255c71a0e..75a348dd8fc0 100644
--- a/metadata/md5-cache/dev-python/bpython-0.14
+++ b/metadata/md5-cache/dev-python/bpython-0.14
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/curtsies[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/greenlet[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/jedi[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/pygments[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/requests[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(-)] >=dev-python/six-1.4[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/urwid[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/watchdog[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(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[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? ( 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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) 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(-)]
+DEPEND=dev-python/curtsies[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/greenlet[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/jedi[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/pygments[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/requests[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(-)] >=dev-python/six-1.4[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/urwid[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/watchdog[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[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? ( 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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) 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=Syntax highlighting and autocompletion for the Python interpreter
 EAPI=5
 HOMEPAGE=http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython
-IUSE=doc gtk test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/curtsies[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/greenlet[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/jedi[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/pygments[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/requests[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(-)] >=dev-python/six-1.4[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/urwid[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/watchdog[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(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) 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(-)]
+RDEPEND=dev-python/curtsies[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/greenlet[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/jedi[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/pygments[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/requests[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(-)] >=dev-python/six-1.4[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/urwid[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/watchdog[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[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://www.bpython-interpreter.org/releases/bpython-0.14.tar.gz mirror://pypi/b/bpython/bpython-0.14.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c2a1dbe294e50057c54adcc225c49ec4
+_md5_=711185d02f740f119c3ec565f5c712aa
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.3.0 b/metadata/md5-cache/dev-python/jsonschema-2.3.0
index de89ae75a2b3..ae6c6b145235 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.3.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of JSON-Schema validation for Python
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/jsonschema
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.3.0.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2656eb6231be9e8eecc8503469dc9546
+_md5_=d83f0d1815b8a3fd92f9521077c11075
diff --git a/metadata/md5-cache/dev-python/pgasync-2.01-r1 b/metadata/md5-cache/dev-python/pgasync-2.01-r1
index 226124d9a274..6cca6bcf798e 100644
--- a/metadata/md5-cache/dev-python/pgasync-2.01-r1
+++ b/metadata/md5-cache/dev-python/pgasync-2.01-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An asynchronous API to PostgreSQL for twisted
 EAPI=5
 HOMEPAGE=http://www.jamwt.com/pgasync/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.jamwt.com/pgasync/files/pgasync-2.01.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dcff1cbafe836a445cf62fd356fce394
+_md5_=1b2ba275ede212788f002d3cda7bfb49
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.1-r1 b/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
index ffc11e8f9451..dbf712283554 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python library for easily displaying tabular data in a visually ap
 EAPI=5
 HOMEPAGE=https://code.google.com/p/prettytable/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=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://prettytable.googlecode.com/files/prettytable-0.7.1.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a06c4271b607555eb780787a75e650be
+_md5_=7ccdb00092aa8278ca6b156f0e09f767
diff --git a/metadata/md5-cache/dev-python/pyode-1.2.0_p20100322 b/metadata/md5-cache/dev-python/pyode-1.2.0_p20100322
deleted file mode 100644
index 3e3fa57f6bdd..000000000000
--- a/metadata/md5-cache/dev-python/pyode-1.2.0_p20100322
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=dev-games/ode-0.7 >=dev-python/pyrex-0.9.4.1 =dev-lang/python-2*
-DESCRIPTION=Python bindings to the ODE physics engine
-EAPI=3
-HOMEPAGE=http://pyode.sourceforge.net/
-IUSE=examples
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-games/ode-0.7 >=dev-python/pyrex-0.9.4.1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/pyode/PyODE-snapshot-2010-03-22.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b805d9a698d51720eff5a33dec63a0d6
diff --git a/metadata/md5-cache/dev-qt/qt-creator-3.3.0 b/metadata/md5-cache/dev-qt/qt-creator-3.3.0
index 179125591f62..e67c1482e01a 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-3.3.0
+++ b/metadata/md5-cache/dev-qt/qt-creator-3.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND==dev-libs/botan-1.10*[threads] >=dev-qt/designer-5.3.2:5 >=dev-qt/qtconcurrent-5.3.2:5 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtdeclarative-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qthelp-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5[ssl] >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtquick1-5.3.2:5 >=dev-qt/qtquickcontrols-5.3.2:5 >=dev-qt/qtscript-5.3.2:5 >=dev-qt/qtsql-5.3.2:5 >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=dev-qt/qtx11extras-5.3.2:5 >=dev-qt/qtxml-5.3.2:5 >=sys-devel/gdb-7.4[client(+),python] clang? ( >=sys-devel/clang-3.2:= ) qbs? ( >=dev-util/qbs-1.3.3[qt5] ) >=dev-qt/linguist-tools-5.3.2:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.3.2:5 ) test? ( >=dev-qt/qttest-5.3.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND==dev-libs/botan-1.10*[threads] >=dev-qt/designer-5.3.2:5 >=dev-qt/qtconcurrent-5.3.2:5 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtdeclarative-5.3.2:5[widgets] >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qthelp-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5[ssl] >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtquick1-5.3.2:5 >=dev-qt/qtquickcontrols-5.3.2:5 >=dev-qt/qtscript-5.3.2:5 >=dev-qt/qtsql-5.3.2:5 >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=dev-qt/qtx11extras-5.3.2:5 >=dev-qt/qtxml-5.3.2:5 >=sys-devel/gdb-7.4[client(+),python] clang? ( >=sys-devel/clang-3.2:= ) qbs? ( >=dev-util/qbs-1.3.3[qt5] ) >=dev-qt/linguist-tools-5.3.2:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.3.2:5 ) test? ( >=dev-qt/qttest-5.3.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
 EAPI=5
 HOMEPAGE=http://qt-project.org/wiki/Category:Tools::QtCreator
@@ -7,8 +7,8 @@ IUSE=debug doc test android autotools baremetal bazaar clang clearcase cmake cvs
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 PDEPEND=autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind )
-RDEPEND==dev-libs/botan-1.10*[threads] >=dev-qt/designer-5.3.2:5 >=dev-qt/qtconcurrent-5.3.2:5 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtdeclarative-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qthelp-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5[ssl] >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtquick1-5.3.2:5 >=dev-qt/qtquickcontrols-5.3.2:5 >=dev-qt/qtscript-5.3.2:5 >=dev-qt/qtsql-5.3.2:5 >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=dev-qt/qtx11extras-5.3.2:5 >=dev-qt/qtxml-5.3.2:5 >=sys-devel/gdb-7.4[client(+),python] clang? ( >=sys-devel/clang-3.2:= ) qbs? ( >=dev-util/qbs-1.3.3[qt5] ) linguas_cs? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_de? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_fr? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_ja? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_pl? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_ru? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_sl? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_uk? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_zh_CN? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_zh_TW? ( >=dev-qt/qttranslations-5.3.2:5 )
+RDEPEND==dev-libs/botan-1.10*[threads] >=dev-qt/designer-5.3.2:5 >=dev-qt/qtconcurrent-5.3.2:5 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtdeclarative-5.3.2:5[widgets] >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qthelp-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5[ssl] >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtquick1-5.3.2:5 >=dev-qt/qtquickcontrols-5.3.2:5 >=dev-qt/qtscript-5.3.2:5 >=dev-qt/qtsql-5.3.2:5 >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=dev-qt/qtx11extras-5.3.2:5 >=dev-qt/qtxml-5.3.2:5 >=sys-devel/gdb-7.4[client(+),python] clang? ( >=sys-devel/clang-3.2:= ) qbs? ( >=dev-util/qbs-1.3.3[qt5] ) linguas_cs? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_de? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_fr? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_ja? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_pl? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_ru? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_sl? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_uk? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_zh_CN? ( >=dev-qt/qttranslations-5.3.2:5 ) linguas_zh_TW? ( >=dev-qt/qttranslations-5.3.2:5 )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qtcreator/3.3/3.3.0/qt-creator-opensource-src-3.3.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=642414d0b585d55b2ba19286ce1652db
+_md5_=795ba06dea117adeb895f66e2b2ace49
diff --git a/metadata/md5-cache/dev-ruby/drydock-0.6.9 b/metadata/md5-cache/dev-ruby/drydock-0.6.9
deleted file mode 100644
index cdcca0336a3c..000000000000
--- a/metadata/md5-cache/dev-ruby/drydock-0.6.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=DSL for building really powerful command line applications
-EAPI=5
-HOMEPAGE=http://solutious.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/drydock-0.6.9.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=94c546945718af5baefdb3d5d3836945
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.1 b/metadata/md5-cache/dev-ruby/facter-2.4.1
index d2f6126da7a3..029b600297f0 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.1
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A cross-platform Ruby library for retrieving facts from operating sy
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~amd64 hppa ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 hppa ppc ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_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/facter-2.4.1.gem
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3a69fa15d1d5886840aa7d0f48694340
+_md5_=0cf2f62b0d6ef79afa3c7da7b7bc2eab
diff --git a/metadata/md5-cache/dev-ruby/flickr-1.0.2-r5 b/metadata/md5-cache/dev-ruby/flickr-1.0.2-r5
deleted file mode 100644
index 7a58e2544b35..000000000000
--- a/metadata/md5-cache/dev-ruby/flickr-1.0.2-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/xml-simple[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=An insanely easy interface to the Flickr photo-sharing service
-EAPI=5
-HOMEPAGE=http://rubyforge.org/projects/flickr/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/xml-simple[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://gentoo/flickr-1.0.2-gentoo.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d27c3b0ee8c196d99da30118d0d1f557
diff --git a/metadata/md5-cache/dev-ruby/gemcutter-0.7.1 b/metadata/md5-cache/dev-ruby/gemcutter-0.7.1
deleted file mode 100644
index d2a977d487c6..000000000000
--- a/metadata/md5-cache/dev-ruby/gemcutter-0.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/shoulda[ruby_targets_ruby19] >=dev-ruby/webmock-1.4.0[ruby_targets_ruby19] dev-ruby/rr[ruby_targets_ruby19] dev-ruby/activesupport[ruby_targets_ruby19] dev-ruby/i18n[ruby_targets_ruby19] dev-ruby/bundler[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=Provides the gem yank and gem webhook commands to RubyGems
-EAPI=4
-HOMEPAGE=http://github.com/rubygems/gemcutter
-IUSE=elibc_FreeBSD ruby_targets_ruby19 test test
-KEYWORDS=~amd64 ~ppc64 ~x86 ~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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=https://github.com/rubygems/gemcutter/tarball/v0.7.1 -> gemcutter-0.7.1-git.tgz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4ba875a9d4750d0422b21187bc8b9157
diff --git a/metadata/md5-cache/dev-ruby/net-dns-0.8.0 b/metadata/md5-cache/dev-ruby/net-dns-0.8.0
deleted file mode 100644
index 4ba9c139186c..000000000000
--- a/metadata/md5-cache/dev-ruby/net-dns-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[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=DNS resolver in pure Ruby
-EAPI=5
-HOMEPAGE=http://net-dns.rubyforge.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=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/net-dns-0.8.0.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=70c764529ca1c9d83e43d806a2a60ef6
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2 b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
index a39e110efdb7..26bc882753b2 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl 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] ) )
+DEPEND=net-misc/curl 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_ruby22? ( dev-lang/ruby:2.2 ) 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_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
 EAPI=5
 HOMEPAGE=http://toland.github.com/patron/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=net-misc/curl 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 )
+RDEPEND=net-misc/curl 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_ruby22? ( dev-lang/ruby:2.2 ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.18.gem
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=afdc59d50b5260308ad216d79d210aa2
+_md5_=f5e96963f3258ab92c15dd63faf583eb
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.10 b/metadata/md5-cache/dev-ruby/psych-2.0.10
deleted file mode 100644
index 82bfde0cee05..000000000000
--- a/metadata/md5-cache/dev-ruby/psych-2.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libyaml-0.1.6 ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/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 libyaml wrapper for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/tenderlove/psych
-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_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/psych-2.0.10.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d5d4eda51b3eea54d62416e211190c3b
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.13 b/metadata/md5-cache/dev-ruby/psych-2.0.13
new file mode 100644
index 000000000000..23e1eca916bf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/psych-2.0.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/libyaml-0.1.6 ruby_targets_ruby19? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) 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_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=A libyaml wrapper for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/tenderlove/psych
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 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_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/psych-2.0.13.gem
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=7c8902ee373c275368b19cfee72fe02b
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.9 b/metadata/md5-cache/dev-ruby/psych-2.0.9
deleted file mode 100644
index e3a3ff97d21f..000000000000
--- a/metadata/md5-cache/dev-ruby/psych-2.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libyaml-0.1.6 ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/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 libyaml wrapper for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/tenderlove/psych
-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_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/psych-2.0.9.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b79a4cc8e505249552cebbb3b97b17e0
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
index f12866241ab3..106531782ace 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm 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/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] ) )
+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_ruby22? ( dev-lang/ruby:2.2 ) 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_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A multipurpose documentation format for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/uwabami/rdtool
-IUSE=emacs elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=emacs elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=Ruby GPL-2
-RDEPEND=emacs? ( virtual/emacs ) 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 )
+RDEPEND=emacs? ( virtual/emacs ) 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_ruby22? ( dev-lang/ruby:2.2 ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdtool-0.6.38.gem
 _eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=007de3b58a9ee843baeb4f25dd14a85e
+_md5_=b0bac54e88ce6b959aebd058d391fe04
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-2.3.1-r1 b/metadata/md5-cache/dev-ruby/ruby_parser-2.3.1-r1
deleted file mode 100644
index 3e75a515e8d5..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-2.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-3.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/sexp_processor-3.0.6[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=2
-HOMEPAGE=http://parsetree.rubyforge.org/
-IUSE=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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-3.0.9[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/ruby_parser-2.3.1.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cad3627789c5e2e643b49f73f8cab48c
diff --git a/metadata/md5-cache/dev-tex/bibtex2html-1.98 b/metadata/md5-cache/dev-tex/bibtex2html-1.98
index e4b7c0d8fa42..0043c9a5698e 100644
--- a/metadata/md5-cache/dev-tex/bibtex2html-1.98
+++ b/metadata/md5-cache/dev-tex/bibtex2html-1.98
@@ -4,11 +4,11 @@ DESCRIPTION=A bibtex to HTML converter
 EAPI=5
 HOMEPAGE=http://www.lri.fr/~filliatr/bibtex2html/
 IUSE=doc +ocamlopt
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=31220b146b684e96359139f96eeffbe2
+_md5_=a9df663d00f0d6ea91ddfbde7b07e1ef
diff --git a/metadata/md5-cache/dev-util/boost-build-1.57.0 b/metadata/md5-cache/dev-util/boost-build-1.57.0
new file mode 100644
index 000000000000..e18d2a9f4234
--- /dev/null
+++ b/metadata/md5-cache/dev-util/boost-build-1.57.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
+DESCRIPTION=A system for large project software construction, which is simple to use and powerful
+EAPI=5
+HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+IUSE=examples python test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Boost-1.0
+RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1
+REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/boost/boost_1_57_0.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=85055afe765495df9db9fbb9f15e614d
diff --git a/metadata/md5-cache/dev-util/debhelper-9.20150101 b/metadata/md5-cache/dev-util/debhelper-9.20150101
index bc1e1a907b6b..08286e690708 100644
--- a/metadata/md5-cache/dev-util/debhelper-9.20150101
+++ b/metadata/md5-cache/dev-util/debhelper-9.20150101
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of programs that can be used to automate common tasks in
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/
 IUSE=test linguas_de linguas_es linguas_fr
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_9.20150101.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b19601bb1e654bfebc03accf6a076b0f
+_md5_=64df9dd6e8bdc9691aee666236bb1fb1
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.67 b/metadata/md5-cache/dev-util/debootstrap-1.0.67
index b7ae5f284256..31cb451ddbe5 100644
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.67
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.67
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Debian/Ubuntu bootstrap scripts
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/d/debootstrap.html
-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=MIT
 RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.67.tar.gz mirror://gentoo/devices.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dac22ab8ebb96d183cb573430ca62a09
+_md5_=562a53c18c822bb7fbb2b03599a53392
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
new file mode 100644
index 000000000000..4cb21c78da30
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=5
+HOMEPAGE=http://developer.nvidia.com/cuda
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-4.9[cxx] >=x11-drivers/nvidia-drivers-343.22[uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 ) x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
+SLOT=0/6.5.19
+SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cuda	2ba75c44d72d2b0b1fe31e2e2dc42d0e	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=958aadf427d16289dcfc9af7511e6109
diff --git a/metadata/md5-cache/games-action/atanks-6.1 b/metadata/md5-cache/games-action/atanks-6.1
index 006785247afb..d8b6b02ac460 100644
--- a/metadata/md5-cache/games-action/atanks-6.1
+++ b/metadata/md5-cache/games-action/atanks-6.1
@@ -3,10 +3,10 @@ DEPEND=media-libs/allegro:0[X] >=sys-apps/sed-4
 DESCRIPTION=Worms and Scorched Earth-like game
 EAPI=5
 HOMEPAGE=http://atanks.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/allegro:0[X] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/atanks/atanks-6.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=efc826c4e07e433892448b5ad737ef16
+_md5_=493187bee031a1b9aebecf0c429f7899
diff --git a/metadata/md5-cache/games-action/awesomenauts-2013.5.21.3 b/metadata/md5-cache/games-action/awesomenauts-2013.5.21.3
index 39b49cc82844..f2dd2eb5315f 100644
--- a/metadata/md5-cache/games-action/awesomenauts-2013.5.21.3
+++ b/metadata/md5-cache/games-action/awesomenauts-2013.5.21.3
@@ -4,11 +4,11 @@ DESCRIPTION=Team-based competetive arena play
 EAPI=5
 HOMEPAGE=http://www.awesomenauts.com/
 IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/opengl virtual/glu amd64? ( || ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) ) !bundled-libs? ( || ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] >=media-libs/libtheora-1.1.1[abi_x86_32(-)] ) || ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ( >=media-libs/libsdl-1.2.15-r4:0[X,opengl,video,abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ( >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] ) ) media-gfx/nvidia-cg-toolkit[multilib] ) ) x86? ( media-libs/freetype x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit media-libs/libogg media-libs/libsdl:0[X,opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal ) ) games-misc/games-envd
 RESTRICT=bindist fetch bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=Awesomenauts-Linux-2013-5-21-3.bin
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=418d18761340e9f3e3dbd0c3351ff4f7
+_md5_=29782e3225ec4c625d5500cd8984fb8e
diff --git a/metadata/md5-cache/games-action/intrusion2-1.024 b/metadata/md5-cache/games-action/intrusion2-1.024
index 83eca8ab64a0..5a92fe83eb54 100644
--- a/metadata/md5-cache/games-action/intrusion2-1.024
+++ b/metadata/md5-cache/games-action/intrusion2-1.024
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup
 DESCRIPTION=Fast paced action sidescroller set in a sci-fi environment
 EAPI=5
 HOMEPAGE=http://intrusion2.com
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=amd64? ( || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] ) || ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ( >=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)] >=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)] ) ) ) x86? ( dev-libs/glib:2 dev-libs/atk x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango media-libs/gst-plugins-base media-libs/gstreamer media-libs/fontconfig media-libs/freetype x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXtst ) games-misc/games-envd
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=intrusion2-1370288626-bin
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=64296f24c934d73a7e9f7408204562fd
+_md5_=1d9377af706842152d52c57218bcfe06
diff --git a/metadata/md5-cache/games-action/lugaru-demo-1.0b b/metadata/md5-cache/games-action/lugaru-demo-1.0b
deleted file mode 100644
index 1a133a8008ec..000000000000
--- a/metadata/md5-cache/games-action/lugaru-demo-1.0b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=3D arcade with unique fighting system and anthropomorphic characters
-HOMEPAGE=http://www.wolfire.com/lugaru
-KEYWORDS=amd64 x86
-LICENSE=all-rights-reserved
-RDEPEND=sys-libs/glibc amd64? ( app-emulation/emul-linux-x86-xlibs ) x86? ( x11-libs/libX11 x11-libs/libXext ) games-misc/games-envd
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=http://cdn.wolfire.com/games/lugaru-linux-x86-1.0b.bin
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ddf9553bbfa21ff44938cd9df66a4451
diff --git a/metadata/md5-cache/games-action/openclonk-5.3.3-r1 b/metadata/md5-cache/games-action/openclonk-5.3.3-r1
deleted file mode 100644
index cd3d4e88571e..000000000000
--- a/metadata/md5-cache/games-action/openclonk-5.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 ) upnp? ( net-libs/libupnp ) >=dev-libs/boost-1.40 virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxml2[python] sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A free multiplayer action game where you control clonks
-EAPI=5
-HOMEPAGE=http://openclonk.org/
-IUSE=dedicated doc mp3 sound upnp
-KEYWORDS=amd64 x86
-LICENSE=BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL
-RDEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 ) upnp? ( net-libs/libupnp ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/openclonk-5.3.3.tar.xz http://openclonk.org/homepage/icon.png -> openclonk.png
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=48f565f80deb4839a2e42f099bc586b3
diff --git a/metadata/md5-cache/games-action/swordandsworcery-1.02 b/metadata/md5-cache/games-action/swordandsworcery-1.02
index a2d88c93f59c..41a613c0d486 100644
--- a/metadata/md5-cache/games-action/swordandsworcery-1.02
+++ b/metadata/md5-cache/games-action/swordandsworcery-1.02
@@ -3,11 +3,11 @@ DESCRIPTION=An exploratory action adventure game with an emphasis on audiovisual
 EAPI=5
 HOMEPAGE=http://www.swordandsworcery.com/
 IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=CAPYBARA-EULA LGPL-3
 RDEPEND=virtual/opengl amd64? ( || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] !bundled-libs? ( >=net-misc/curl-7.36.0[abi_x86_32(-)] ) ) ) || ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) !bundled-libs? ( || ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,sound,video,opengl,joystick,abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-soundlibs[alsa,-abi_x86_32(-)] ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libsndfile-1.0.25[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)] ) ) ) x86? ( dev-libs/openssl media-libs/alsa-lib media-libs/flac media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-sound/pulseaudio sys-libs/zlib virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst !bundled-libs? ( net-misc/curl media-libs/libsdl[X,sound,video,opengl,joystick] ) ) games-misc/games-envd
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=swordandsworcery_1.02.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d98f39a8ab7cf4a5ac93d1edbe01f85b
+_md5_=1066ba58e21d0310e4a20e21f933a0a3
diff --git a/metadata/md5-cache/games-action/trine2-1.16 b/metadata/md5-cache/games-action/trine2-1.16
index 3d8369935134..30e059b2bfe7 100644
--- a/metadata/md5-cache/games-action/trine2-1.16
+++ b/metadata/md5-cache/games-action/trine2-1.16
@@ -4,11 +4,11 @@ DESCRIPTION=A sidescrolling game of action, puzzles and platforming
 EAPI=5
 HOMEPAGE=http://www.trine2.com/
 IUSE=bundled-libs +launcher
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=amd64? ( || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] launcher? ( >=media-libs/libpng-1.5.18:1.5[abi_x86_32(-)] ) ) ) || ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) || ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ( >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] ) ) || ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] launcher? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) launcher? ( || ( app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] ) ) !bundled-libs? ( media-gfx/nvidia-cg-toolkit[multilib] ) ) x86? ( dev-libs/glib:2 media-libs/freetype media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl launcher? ( media-libs/fontconfig media-libs/libpng:1.5 x11-libs/gtk+:2 x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm ) !bundled-libs? ( media-gfx/nvidia-cg-toolkit ) ) games-misc/games-envd
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=trine2_linux_installer.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=98f7bc32a9038907a68374e8cba3fb31
+_md5_=58bcded21562bf1292bb8da00c61d7da
diff --git a/metadata/md5-cache/games-action/xpilot-4.5.5 b/metadata/md5-cache/games-action/xpilot-4.5.5
index 28e31e044414..986c6045fe4d 100644
--- a/metadata/md5-cache/games-action/xpilot-4.5.5
+++ b/metadata/md5-cache/games-action/xpilot-4.5.5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto x11-misc/gccmakedep x11-misc/imake app-text/rman
 DESCRIPTION=A multi-player 2D client/server space game
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.xpilot.org/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/xpilotgame/xpilot-4.5.5.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=18fd17c22e22b321d88cf2494f47f359
+_md5_=e0a9a31735addfeb9babc193278cf0b9
diff --git a/metadata/md5-cache/games-arcade/bub-n-bros-1.6 b/metadata/md5-cache/games-arcade/bub-n-bros-1.6
deleted file mode 100644
index 7807da5cc883..000000000000
--- a/metadata/md5-cache/games-arcade/bub-n-bros-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A multiplayer clone of the famous Bubble Bobble game
-EAPI=2
-HOMEPAGE=http://bub-n-bros.sourceforge.net/
-KEYWORDS=alpha amd64 ppc sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=dev-python/pygame =dev-lang/python-2* games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/bub-n-bros/bubbros-1.6.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0a2097fdfbb34680d15d1a6909a4b30e
diff --git a/metadata/md5-cache/games-arcade/cosmosmash-1.4.6 b/metadata/md5-cache/games-arcade/cosmosmash-1.4.6
deleted file mode 100644
index 43a1e39d5963..000000000000
--- a/metadata/md5-cache/games-arcade/cosmosmash-1.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A space rock shooting video game
-EAPI=5
-HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-games/flatzebra-0.1.6 games-misc/games-envd
-RESTRICT=test
-SLOT=0
-SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash-1.4.6.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=aabc6f7c0bd884ad2e6274d33fcb1b6e
diff --git a/metadata/md5-cache/games-arcade/funnyboat-1.5 b/metadata/md5-cache/games-arcade/funnyboat-1.5
deleted file mode 100644
index 45e2b2faba8b..000000000000
--- a/metadata/md5-cache/games-arcade/funnyboat-1.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=A side scrolling shooter game starring a steamboat on the sea
-HOMEPAGE=http://funnyboat.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
-LICENSE=GPL-2 MIT
-RDEPEND=>=dev-python/pygame-1.6.2 =dev-lang/python-2* games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/funnyboat/funnyboat-1.5-src.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=02f1733d2fc6ce5649aff5fe0bf7654f
diff --git a/metadata/md5-cache/games-arcade/gish-demo-1.6 b/metadata/md5-cache/games-arcade/gish-demo-1.6
index 32ef0fb78598..c8ff9ca94695 100644
--- a/metadata/md5-cache/games-arcade/gish-demo-1.6
+++ b/metadata/md5-cache/games-arcade/gish-demo-1.6
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Play as an amorphous ball of tar that rolls and squishes around
 EAPI=5
 HOMEPAGE=http://www.chroniclogic.com/gish.htm
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=media-libs/libsdl media-libs/libvorbis virtual/opengl x11-libs/libX11 >=media-libs/openal-1.6.372 games-misc/games-envd
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://s159260531.onlinehome.us/demos/gishdemo.tar.gz -> gish-demo-1.6.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=e434fdc3b3ae6bcd4259ffd3e7d88099
+_md5_=51a6103ef570184ae205d449c69688ac
diff --git a/metadata/md5-cache/games-arcade/jardinains-2.0-r1 b/metadata/md5-cache/games-arcade/jardinains-2.0-r1
index df185bef82aa..d727907f2593 100644
--- a/metadata/md5-cache/games-arcade/jardinains-2.0-r1
+++ b/metadata/md5-cache/games-arcade/jardinains-2.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Arkanoid with Gnomes
 EAPI=5
 HOMEPAGE=http://www.jardinains2.com
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=jardinains
 RDEPEND=sys-libs/libstdc++-v3:5 amd64? ( sys-libs/libstdc++-v3:5[multilib] ) || ( ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0-r1[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/JN2_1_FREE_LIN.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b4ca4432c7e9d5cafd437d9fa2b750da
+_md5_=79f1f4eac390dcf2c7a97e2703f62064
diff --git a/metadata/md5-cache/games-arcade/supertux-0.1.3 b/metadata/md5-cache/games-arcade/supertux-0.1.3
index 79b367e26a65..8353bca70697 100644
--- a/metadata/md5-cache/games-arcade/supertux-0.1.3
+++ b/metadata/md5-cache/games-arcade/supertux-0.1.3
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick] media-libs/sdl-image[png,jpeg] media-libs/sdl-mixer[mod,vorbis] x11-libs/libXt games-misc/games-envd
 SLOT=0
-SRC_URI=mirror://berlios/supertux/supertux-0.1.3.tar.bz2
+SRC_URI=https://supertux.googlecode.com/files/supertux-0.1.3.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=27c4164ba82020d7c94fe0da4d29b758
+_md5_=890ba4753ab8c012602898b2ef117b0d
diff --git a/metadata/md5-cache/games-board/domination-1.1.1.5 b/metadata/md5-cache/games-board/domination-1.1.1.5
index 34550a4685c9..a9f51b930cc9 100644
--- a/metadata/md5-cache/games-board/domination-1.1.1.5
+++ b/metadata/md5-cache/games-board/domination-1.1.1.5
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.5.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fab114ee25298dcd52c341a378fd8a0a
+_md5_=9e6238645da2c7c6c45fbf6fe6715a4e
diff --git a/metadata/md5-cache/games-board/pokerth-1.1.1 b/metadata/md5-cache/games-board/pokerth-1.1.1
index 868826bcdfc5..008f8d07d401 100644
--- a/metadata/md5-cache/games-board/pokerth-1.1.1
+++ b/metadata/md5-cache/games-board/pokerth-1.1.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/boost[threads(+)] dev-libs/protobuf dev-libs/libgcrypt:0 dev-libs/tinyxml[stl] amd64? ( net-libs/libircclient ) ppc? ( >=net-libs/libircclient-1.6-r2 ) x86? ( net-libs/libircclient ) >=net-misc/curl-7.16 dev-qt/qtcore:4 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:4 ) !dedicated? ( dev-qt/qtsql:4 ) virtual/pkgconfig
+DEPEND=dev-db/sqlite:3 dev-libs/boost:=[threads(+)] dev-libs/protobuf dev-libs/libgcrypt:0 dev-libs/tinyxml[stl] amd64? ( net-libs/libircclient ) ppc? ( >=net-libs/libircclient-1.6-r2 ) x86? ( net-libs/libircclient ) >=net-misc/curl-7.16 dev-qt/qtcore:4 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:4 ) !dedicated? ( dev-qt/qtsql:4 ) virtual/pkgconfig
 DESCRIPTION=Texas Hold'em poker game
 EAPI=5
 HOMEPAGE=http://www.pokerth.net/
 IUSE=dedicated
 KEYWORDS=amd64 ppc x86
 LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
-RDEPEND=dev-db/sqlite:3 dev-libs/boost[threads(+)] dev-libs/protobuf dev-libs/libgcrypt:0 dev-libs/tinyxml[stl] amd64? ( net-libs/libircclient ) ppc? ( >=net-libs/libircclient-1.6-r2 ) x86? ( net-libs/libircclient ) >=net-misc/curl-7.16 dev-qt/qtcore:4 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:4 ) games-misc/games-envd
+RDEPEND=dev-db/sqlite:3 dev-libs/boost:=[threads(+)] dev-libs/protobuf dev-libs/libgcrypt:0 dev-libs/tinyxml[stl] amd64? ( net-libs/libircclient ) ppc? ( >=net-libs/libircclient-1.6-r2 ) x86? ( net-libs/libircclient ) >=net-misc/curl-7.16 dev-qt/qtcore:4 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:4 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pokerth/PokerTH-1.1.1-src.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2cbe1ae73d4679ade48154f592a3cff5
+_md5_=14e304363f1952118ad65d2171cb071d
diff --git a/metadata/md5-cache/games-emulation/advancemenu-2.7 b/metadata/md5-cache/games-emulation/advancemenu-2.7
index 950e263820c7..66082f0e657f 100644
--- a/metadata/md5-cache/games-emulation/advancemenu-2.7
+++ b/metadata/md5-cache/games-emulation/advancemenu-2.7
@@ -4,10 +4,10 @@ DESCRIPTION=Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator
 EAPI=5
 HOMEPAGE=http://advancemame.sourceforge.net/menu-readme.html
 IUSE=alsa debug fbcon ncurses oss sdl slang truetype
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses ) sdl? ( media-libs/libsdl ) slang? ( >=sys-libs/slang-1.4 ) !sdl? ( ( !fbcon? ( media-libs/libsdl ) ) ) truetype? ( >=media-libs/freetype-2 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/advancemame/advancemenu-2.7.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=799250f6467a366ee2024d017a366180
+_md5_=5ba8d961cef8f8f1cce2e3241a2d3503
diff --git a/metadata/md5-cache/games-emulation/daphne-1.0 b/metadata/md5-cache/games-emulation/daphne-1.0
index 732341803528..5e8e3f68d949 100644
--- a/metadata/md5-cache/games-emulation/daphne-1.0
+++ b/metadata/md5-cache/games-emulation/daphne-1.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libogg media-libs/libvorbis media-libs/libsdl[video] media-libs/sdl-mixer media-libs/glew
+DEPEND=media-libs/libogg media-libs/libvorbis sys-libs/zlib media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/libmpeg2 virtual/opengl media-libs/glew
 DESCRIPTION=Laserdisc Arcade Game Emulator
 EAPI=5
 HOMEPAGE=http://www.daphne-emu.com/
 KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libogg media-libs/libvorbis media-libs/libsdl[video] media-libs/sdl-mixer media-libs/glew games-misc/games-envd
+LICENSE=GPL-2+
+RDEPEND=media-libs/libogg media-libs/libvorbis sys-libs/zlib media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/libmpeg2 virtual/opengl media-libs/glew games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.daphne-emu.com/download/daphne-1.0-src.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b65581009285b566dbdb983e76cf4371
+_md5_=3db46a42ab78284229eb8a58aedcb56d
diff --git a/metadata/md5-cache/games-emulation/dboxfe-0.1.3 b/metadata/md5-cache/games-emulation/dboxfe-0.1.3
index 052b5b040ebe..04f8e0b1ba98 100644
--- a/metadata/md5-cache/games-emulation/dboxfe-0.1.3
+++ b/metadata/md5-cache/games-emulation/dboxfe-0.1.3
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4
 DESCRIPTION=Creates and manages configuration files for DOSBox
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/dboxfe.berlios/
-KEYWORDS=~amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 >=games-emulation/dosbox-0.65 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/dboxfe.berlios/dboxfe-0.1.3.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=bce2453d630c64415d913f8281912579
+_md5_=37365d1fa8d83d6ef56f32237de35a2d
diff --git a/metadata/md5-cache/games-emulation/dgen-sdl-1.32 b/metadata/md5-cache/games-emulation/dgen-sdl-1.32
deleted file mode 100644
index 8b679322ac90..000000000000
--- a/metadata/md5-cache/games-emulation/dgen-sdl-1.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[joystick?] app-arch/libarchive opengl? ( virtual/opengl ) x86? ( dev-lang/nasm )
-DESCRIPTION=A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator
-EAPI=5
-HOMEPAGE=http://dgen.sourceforge.net/
-IUSE=joystick opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=dgen-sdl BSD BSD-2 free-noncomm LGPL-2.1+ GPL-2+
-RDEPEND=media-libs/libsdl[joystick?] app-arch/libarchive opengl? ( virtual/opengl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/dgen/files/dgen-sdl-1.32.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=3b1a6977edbe57e6a4aae6748d7343f9
diff --git a/metadata/md5-cache/games-emulation/fceux-2.1.5 b/metadata/md5-cache/games-emulation/fceux-2.1.5
deleted file mode 100644
index 7026aaec587b..000000000000
--- a/metadata/md5-cache/games-emulation/fceux-2.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=lua? ( dev-lang/lua ) media-libs/libsdl[opengl?,video] opengl? ( virtual/opengl ) x11-libs/gtk+:2 sys-libs/zlib gnome-extra/zenity dev-util/scons
-DESCRIPTION=A portable Famicom/NES emulator, an evolution of the original FCE Ultra
-EAPI=4
-HOMEPAGE=http://fceux.com/
-IUSE=+lua +opengl
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=lua? ( dev-lang/lua ) media-libs/libsdl[opengl?,video] opengl? ( virtual/opengl ) x11-libs/gtk+:2 sys-libs/zlib gnome-extra/zenity games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/fceultra/fceux-2.1.5.src.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b2182e1e9ca7f7464f6d274d00da4b45
diff --git a/metadata/md5-cache/games-emulation/generator-0.35_p4 b/metadata/md5-cache/games-emulation/generator-0.35_p4
index 442ff205808a..a037f31c8f2d 100644
--- a/metadata/md5-cache/games-emulation/generator-0.35_p4
+++ b/metadata/md5-cache/games-emulation/generator-0.35_p4
@@ -4,10 +4,10 @@ DESCRIPTION=Sega Genesis / Mega Drive emulator
 EAPI=5
 HOMEPAGE=http://www.squish.net/generator/
 IUSE=+sdlaudio
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[sound] ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.squish.net/generator/cbiere/generator/generator-0.35-cbiere-r4.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=340d5635e75945cc3f42564efe9b4ee7
+_md5_=b5360c3e4a474a0ae18643dbfaedc1fd
diff --git a/metadata/md5-cache/games-emulation/gngeo-0.8 b/metadata/md5-cache/games-emulation/gngeo-0.8
index 3dcdabd6a8ff..be0d9b712444 100644
--- a/metadata/md5-cache/games-emulation/gngeo-0.8
+++ b/metadata/md5-cache/games-emulation/gngeo-0.8
@@ -3,10 +3,10 @@ DEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] sys-libs/zl
 DESCRIPTION=A NeoGeo emulator
 EAPI=5
 HOMEPAGE=http://code.google.com/p/gngeo/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] sys-libs/zlib[minizip] games-misc/games-envd
 SLOT=0
 SRC_URI=http://gngeo.googlecode.com/files/gngeo-0.8.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=55973bd815adfdd93d3f8f33003df034
+_md5_=bf92c00320bcad970ef4e54ea285f5c4
diff --git a/metadata/md5-cache/games-emulation/hatari-1.8.0 b/metadata/md5-cache/games-emulation/hatari-1.8.0
index 3dc220740d74..eee6170e0a0f 100644
--- a/metadata/md5-cache/games-emulation/hatari-1.8.0
+++ b/metadata/md5-cache/games-emulation/hatari-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Atari ST emulator
 EAPI=5
 HOMEPAGE=http://hatari.tuxfamily.org/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] media-libs/libsdl[X,sound,video] sys-libs/readline:0 media-libs/libpng:0 sys-libs/zlib dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-emulation/emutos games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/hatari/1.8.0/hatari-1.8.0.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f7f3243b68ece67943cea5639d13f975
+_md5_=c62d0475c28b1a818f4675e6c4905606
diff --git a/metadata/md5-cache/games-emulation/higan-092 b/metadata/md5-cache/games-emulation/higan-092
deleted file mode 100644
index f2f139fbd4bb..000000000000
--- a/metadata/md5-cache/games-emulation/higan-092
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) !qt4? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.5:4 ) virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A Nintendo multi-system emulator formerly known as bsnes
-EAPI=5
-HOMEPAGE=http://byuu.org/higan/ https://code.google.com/p/higan/
-IUSE=ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio qt4 +sdl xv
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 x11-libs/libXext ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) !qt4? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.5:4 ) games-misc/games-envd
-REQUIRED_USE=|| ( ao openal alsa pulseaudio oss ) || ( xv opengl sdl ) || ( profile_accuracy profile_balanced profile_performance )
-SLOT=0
-SRC_URI=http://higan.googlecode.com/files/higan_v092-source.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=aa65d3cb188ba50457f4b370f62fc6bd
diff --git a/metadata/md5-cache/games-emulation/mamory-0.2.25 b/metadata/md5-cache/games-emulation/mamory-0.2.25
index bfb5c7390e47..4bfee5783e7f 100644
--- a/metadata/md5-cache/games-emulation/mamory-0.2.25
+++ b/metadata/md5-cache/games-emulation/mamory-0.2.25
@@ -3,10 +3,10 @@ DEPEND=dev-libs/expat !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-
 DESCRIPTION=ROM management tools and library
 EAPI=5
 HOMEPAGE=http://mamory.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/mamory/mamory-0.2.25.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d2bb013525418b926bd8156ee605691f
+_md5_=c984bee89854d7a8664314c3f529aac6
diff --git a/metadata/md5-cache/games-emulation/mednafen-0.9.32 b/metadata/md5-cache/games-emulation/mednafen-0.9.32
deleted file mode 100644
index f51f7f5f0d28..000000000000
--- a/metadata/md5-cache/games-emulation/mednafen-0.9.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-net sys-libs/zlib[minizip] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator
-EAPI=5
-HOMEPAGE=http://mednafen.sourceforge.net/
-IUSE=alsa altivec cjk debugger jack nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-net sys-libs/zlib[minizip] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/mednafen/mednafen-0.9.32-wip.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c0f452b3cc7b58bb3f87eb2cf7c8e4e1
diff --git a/metadata/md5-cache/games-emulation/nestopia-1.46.2 b/metadata/md5-cache/games-emulation/nestopia-1.46.2
new file mode 100644
index 000000000000..04da29b4b973
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/nestopia-1.46.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=x11-libs/gtk+:3 media-libs/libao media-libs/libsdl2[sound,joystick,video] app-arch/libarchive sys-libs/zlib virtual/opengl virtual/glu virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A portable Nintendo Entertainment System emulator written in C++
+EAPI=5
+HOMEPAGE=http://0ldsk00l.ca/nestopia/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/gtk+:3 media-libs/libao media-libs/libsdl2[sound,joystick,video] app-arch/libarchive sys-libs/zlib virtual/opengl virtual/glu games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/nestopiaue/1.46/nestopia-1.46.2.tgz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=1321c5b0c2d368fb5dad6869ba2a82fa
diff --git a/metadata/md5-cache/games-emulation/virtualjaguar-1.0.7-r1 b/metadata/md5-cache/games-emulation/virtualjaguar-1.0.7-r1
deleted file mode 100644
index 0d3d527cc5ee..000000000000
--- a/metadata/md5-cache/games-emulation/virtualjaguar-1.0.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/libsdl[sound,joystick,opengl,video] sys-apps/gentoo-functions
-DESCRIPTION=an Atari Jaguar emulator
-EAPI=2
-HOMEPAGE=http://www.icculus.org/virtualjaguar/
-KEYWORDS=~ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl media-libs/libsdl[sound,joystick,opengl,video] sys-apps/gentoo-functions games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.icculus.org/virtualjaguar/tarballs/virtualjaguar-1.0.7-src.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=339edd7a6113fcbc78e3d245a510ef5c
diff --git a/metadata/md5-cache/games-engines/gemrb-0.8.1 b/metadata/md5-cache/games-engines/gemrb-0.8.1
deleted file mode 100644
index 23abf272a7b1..000000000000
--- a/metadata/md5-cache/games-engines/gemrb-0.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/freetype media-libs/libpng:0 >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer sys-libs/zlib =dev-lang/python-2* sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
-DESCRIPTION=Reimplementation of the Infinity engine
-EAPI=3
-HOMEPAGE=http://gemrb.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype media-libs/libpng:0 >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer sys-libs/zlib =dev-lang/python-2* games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/gemrb/gemrb-0.8.1.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a1eb6d47e5575b4185a030f08d92550e
diff --git a/metadata/md5-cache/games-engines/love-0.7.2-r1 b/metadata/md5-cache/games-engines/love-0.7.2-r1
index 4855b846489d..e66be1284f9f 100644
--- a/metadata/md5-cache/games-engines/love-0.7.2-r1
+++ b/metadata/md5-cache/games-engines/love-0.7.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff
 DESCRIPTION=A framework for 2D games in Lua
-EAPI=3
+EAPI=5
 HOMEPAGE=http://love2d.org/
 KEYWORDS=amd64 x86
 LICENSE=ZLIB
@@ -9,4 +9,4 @@ RDEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff]
 SLOT=0.7
 SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.7.2-linux-src.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1397b782afb418af7ab4b418a64c611d
+_md5_=54a4973d661d62200e97c51b3015618a
diff --git a/metadata/md5-cache/games-engines/love-0.8.0 b/metadata/md5-cache/games-engines/love-0.8.0
index af2cb90fca4e..875c68217d0e 100644
--- a/metadata/md5-cache/games-engines/love-0.8.0
+++ b/metadata/md5-cache/games-engines/love-0.8.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff
+DEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff
 DESCRIPTION=A framework for 2D games in Lua
 EAPI=5
 HOMEPAGE=http://love2d.org/
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=ZLIB
-RDEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl games-misc/games-envd
+RDEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl games-misc/games-envd
 SLOT=0
 SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.8.0-linux-src.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=5008a122c2b6d745726ba3c23d97940b
+_md5_=ca8a526f8047f159ea709e1527fe4c60
diff --git a/metadata/md5-cache/games-engines/qtads-2.1.5 b/metadata/md5-cache/games-engines/qtads-2.1.5
deleted file mode 100644
index eb740a3cb99f..000000000000
--- a/metadata/md5-cache/games-engines/qtads-2.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound] media-libs/sdl-mixer[midi,vorbis] media-libs/sdl-sound[mp3] dev-qt/qtcore:4 dev-qt/qtgui:4 >=sys-apps/sed-4
-DESCRIPTION=Multimedia interpreter for TADS text adventures
-EAPI=4
-HOMEPAGE=http://qtads.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound] media-libs/sdl-mixer[midi,vorbis] media-libs/sdl-sound[mp3] dev-qt/qtcore:4 dev-qt/qtgui:4 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/qtads/qtads-2.1.5.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a54b56292c5c02936392a4a2ed1c64a0
diff --git a/metadata/md5-cache/games-engines/residualvm-0.1.1 b/metadata/md5-cache/games-engines/residualvm-0.1.1
deleted file mode 100644
index eb8c3e9efdd9..000000000000
--- a/metadata/md5-cache/games-engines/residualvm-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/libsdl[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/opengl >=sys-apps/sed-4
-DESCRIPTION=A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures
-EAPI=5
-HOMEPAGE=http://www.residualvm.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/libsdl[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/opengl games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/residualvm/residualvm-0.1.1-sources.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=68df28732548da94c096b7bb8fef8e38
diff --git a/metadata/md5-cache/games-engines/scummvm-tools-1.7.0 b/metadata/md5-cache/games-engines/scummvm-tools-1.7.0
index 336b54129eef..57d77129d598 100644
--- a/metadata/md5-cache/games-engines/scummvm-tools-1.7.0
+++ b/metadata/md5-cache/games-engines/scummvm-tools-1.7.0
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scummvm/scummvm-tools-1.7.0.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=0d9a59a80f8e21577cac74f3d65466b7
+_md5_=3b341106ec3c5fb2dfdcc3d04ed2a1cb
diff --git a/metadata/md5-cache/games-engines/stratagus-2.2.7 b/metadata/md5-cache/games-engines/stratagus-2.2.7
index 58379053f0e1..2c77cbe2b2ff 100644
--- a/metadata/md5-cache/games-engines/stratagus-2.2.7
+++ b/metadata/md5-cache/games-engines/stratagus-2.2.7
@@ -4,11 +4,11 @@ DESCRIPTION=A realtime strategy game engine
 EAPI=5
 HOMEPAGE=http://stratagus.sourceforge.net/
 IUSE=bzip2 debug doc mikmod mng theora vorbis
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[sound,opengl,video] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) ) games-misc/games-envd
 REQUIRED_USE=theora? ( vorbis )
 SLOT=0
 SRC_URI=http://launchpad.net/stratagus/trunk/2.2.7/+download/stratagus_2.2.7.orig.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=30751a011142162a6bfe1514c6b0af1a
+_md5_=b6ce7dbc404361528f7dcd43e3b28ee4
diff --git a/metadata/md5-cache/games-kids/gcompris-14.12 b/metadata/md5-cache/games-kids/gcompris-14.12
index f39fd2c56fb6..21003af60e75 100644
--- a/metadata/md5-cache/games-kids/gcompris-14.12
+++ b/metadata/md5-cache/games-kids/gcompris-14.12
@@ -4,11 +4,11 @@ DESCRIPTION=full featured educational application for children from 2 to 10
 EAPI=5
 HOMEPAGE=http://gcompris.net/
 IUSE=gstreamer python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-3+
 RDEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk(+)] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl:0 ) dev-libs/libxml2 dev-libs/popt virtual/libintl dev-db/sqlite:3 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] media-gfx/tuxpaint sci-electronics/gnucap games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://gcompris.net/download/gcompris-14.12.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=52cbc70846590a6256a650a7d672b695
+_md5_=14dea210fa65ade682febb918e40574f
diff --git a/metadata/md5-cache/games-mud/kildclient-2.9.0 b/metadata/md5-cache/games-mud/kildclient-2.9.0
deleted file mode 100644
index 3f07f5585f78..000000000000
--- a/metadata/md5-cache/games-mud/kildclient-2.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 gnome-base/libglade dev-lang/perl sys-libs/zlib virtual/libintl spell? ( app-text/gtkspell:2 ) gnutls? ( net-libs/gnutls ) sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Powerful MUD client with a built-in PERL interpreter
-EAPI=5
-HOMEPAGE=http://kildclient.sourceforge.net
-IUSE=doc gnutls spell
-KEYWORDS=~amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2 gnome-base/libglade dev-lang/perl sys-libs/zlib virtual/libintl spell? ( app-text/gtkspell:2 ) gnutls? ( net-libs/gnutls ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/kildclient/kildclient-2.9.0.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0e487baacb9fdb1e21329d16f952c64f
diff --git a/metadata/md5-cache/games-puzzle/amoebax-0.2.1 b/metadata/md5-cache/games-puzzle/amoebax-0.2.1
index 0e47ded5e86f..284dd53c7301 100644
--- a/metadata/md5-cache/games-puzzle/amoebax-0.2.1
+++ b/metadata/md5-cache/games-puzzle/amoebax-0.2.1
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-l
 DESCRIPTION=a cute and addictive action-puzzle game, similar to tetris
 EAPI=5
 HOMEPAGE=http://www.emma-soft.com/games/amoebax/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=FreeArt GPL-2
 RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.emma-soft.com/games/amoebax/download/amoebax-0.2.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b4547ce118f1d64189dacc3517f568ab
+_md5_=70ed3597c425b5c32d71bf8f5d22aa6e
diff --git a/metadata/md5-cache/games-puzzle/bubble-chains-0.1.1 b/metadata/md5-cache/games-puzzle/bubble-chains-0.1.1
index 21323e409032..3a17904c3c9f 100644
--- a/metadata/md5-cache/games-puzzle/bubble-chains-0.1.1
+++ b/metadata/md5-cache/games-puzzle/bubble-chains-0.1.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXrandr dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/libsdl[sou
 DESCRIPTION=Arcade-puzzle game
 EAPI=5
 HOMEPAGE=http://bubble-chains.sintegrial.com/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/libXrandr dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/libsdl[sound,video] media-libs/sdl-mixer games-misc/games-envd
 SLOT=0
 SRC_URI=http://bubble-chains.sintegrial.com/files/chains-0.1.1-src.7z
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ab1c7f5bc77ad72840924e5d5554d955
+_md5_=a5617b92c4b92db5aea04bb0919c4ba7
diff --git a/metadata/md5-cache/games-puzzle/colorcode-0.7.2 b/metadata/md5-cache/games-puzzle/colorcode-0.7.2
index a36421d8480a..002964f62263 100644
--- a/metadata/md5-cache/games-puzzle/colorcode-0.7.2
+++ b/metadata/md5-cache/games-puzzle/colorcode-0.7.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=dev-qt/qtgui:4
 DESCRIPTION=A free advanced MasterMind clone
-EAPI=2
+EAPI=5
 HOMEPAGE=http://colorcode.laebisch.com/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtgui:4 games-misc/games-envd
 SLOT=0
 SRC_URI=http://colorcode.laebisch.com/download/ColorCode-0.7.2.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=89512fbccbd640a1c79e2bb7f50847e3
+_md5_=15eab06a0a21dfaa685a9abba4c536e1
diff --git a/metadata/md5-cache/games-puzzle/concentration-1.2-r1 b/metadata/md5-cache/games-puzzle/concentration-1.2-r1
index 8160df99cdae..50a90b933b99 100644
--- a/metadata/md5-cache/games-puzzle/concentration-1.2-r1
+++ b/metadata/md5-cache/games-puzzle/concentration-1.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-ttf
 DESCRIPTION=The classic memory game with some new life
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.happypenguin.org/show?Concentration
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/s
 SLOT=0
 SRC_URI=mirror://gentoo/concentration-1.2.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=19a11d5041f1963ad7bf18a8dd5a7eba
+_md5_=cdb13438d45962f33570658b8dfccbfc
diff --git a/metadata/md5-cache/games-puzzle/connectagram-1.1.2 b/metadata/md5-cache/games-puzzle/connectagram-1.1.2
deleted file mode 100644
index fbfaea15d459..000000000000
--- a/metadata/md5-cache/games-puzzle/connectagram-1.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-qt/qtcore-4.6:4 >=dev-qt/qtgui-4.6:4 >=sys-apps/sed-4
-DESCRIPTION=A word unscrambling game
-EAPI=5
-HOMEPAGE=http://gottcode.org/connectagram/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtcore-4.6:4 >=dev-qt/qtgui-4.6:4 games-misc/games-envd
-SLOT=0
-SRC_URI=http://gottcode.org/connectagram/connectagram-1.1.2-src.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=00f80a39eaa466815585101b59ff4d48
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.0.0 b/metadata/md5-cache/games-puzzle/cuyo-2.0.0
new file mode 100644
index 000000000000..a094ba0489db
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/cuyo-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image virtual/libintl sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=highly addictive and remotely related to tetris
+EAPI=5
+HOMEPAGE=http://www.karimmi.de/cuyo/
+IUSE=+music
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image virtual/libintl games-misc/games-envd
+SLOT=0
+SRC_URI=http://savannah.nongnu.org/download/cuyo/cuyo-2.0.0.tar.gz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=d5ff049c138b3bf6eed2b93c43875ef6
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.1.1 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1
index 6f80d4633758..84a504781092 100644
--- a/metadata/md5-cache/games-puzzle/cuyo-2.1.1
+++ b/metadata/md5-cache/games-puzzle/cuyo-2.1.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
 DESCRIPTION=highly addictive and remotely related to tetris
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.karimmi.de/cuyo/
 IUSE=+music
 KEYWORDS=amd64 ppc x86
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music?
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=36b3fe3a7547a2448dfee524f25fa5d0
+_md5_=4c761fb8857daa3ef309a4d9684c3429
diff --git a/metadata/md5-cache/games-puzzle/einstein-2.0 b/metadata/md5-cache/games-puzzle/einstein-2.0
index c12ee244e64c..efb81508b372 100644
--- a/metadata/md5-cache/games-puzzle/einstein-2.0
+++ b/metadata/md5-cache/games-puzzle/einstein-2.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
 DESCRIPTION=A puzzle game inspired by Albert Einstein
-EAPI=2
+EAPI=5
 HOMEPAGE=https://freecode.com/projects/einsteinpuzzle
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf g
 SLOT=0
 SRC_URI=mirror://gentoo/einstein-2.0-src.tar.gz mirror://gentoo/einstein.png
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a77ad294e925ec8895342bf494cfa660
+_md5_=2d8fb5b8d7657fc463945db2f990e708
diff --git a/metadata/md5-cache/games-puzzle/fbg-0.9-r1 b/metadata/md5-cache/games-puzzle/fbg-0.9-r1
index ee9d795ed2a5..04c673b03fa0 100644
--- a/metadata/md5-cache/games-puzzle/fbg-0.9-r1
+++ b/metadata/md5-cache/games-puzzle/fbg-0.9-r1
@@ -1,6 +1,7 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl media-libs/libmikmod x11-libs/libXt
 DESCRIPTION=A Tetris clone written in OpenGL
+EAPI=5
 HOMEPAGE=http://fbg.sourceforge.net/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
@@ -8,4 +9,4 @@ RDEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl media-libs
 SLOT=0
 SRC_URI=mirror://sourceforge/fbg/fbg-0.9.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=6be4df63acfe8e73aca45fe2cb858946
+_md5_=f20b23b5461a15bf7078c1745029c5b1
diff --git a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1 b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1
index 11ccde3985bd..04db0ddd579b 100644
--- a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1
+++ b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Underwater puzzle game - find a safe way out
-EAPI=2
+EAPI=5
 HOMEPAGE=http://fillets.sourceforge.net/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.5[vorbis
 SLOT=0
 SRC_URI=mirror://sourceforge/fillets/fillets-ng-1.0.1.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=bd22ebdb2db9f8f1ea0257fc26fac276
+_md5_=6be9cfdc57b2634aad6dfdacc18d12c2
diff --git a/metadata/md5-cache/games-puzzle/gottet-1.0.6 b/metadata/md5-cache/games-puzzle/gottet-1.0.6
index a38adc75fc56..721b797b7b50 100644
--- a/metadata/md5-cache/games-puzzle/gottet-1.0.6
+++ b/metadata/md5-cache/games-puzzle/gottet-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=A tetris clone based on Qt4
 EAPI=5
 HOMEPAGE=http://gottcode.org/gottet/
 IUSE=linguas_ca linguas_de linguas_en linguas_es linguas_fr linguas_he linguas_ko linguas_ms linguas_pl linguas_ro linguas_ru linguas_tr linguas_vi
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 games-misc/games-envd
 SLOT=0
 SRC_URI=http://gottcode.org/gottet/gottet-1.0.6-src.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=336cfe7264526524a506468befd3b5cc
+_md5_=cb673bf2ff094bb16c2cfe13459fcad8
diff --git a/metadata/md5-cache/games-puzzle/shaaft-0.5.0 b/metadata/md5-cache/games-puzzle/shaaft-0.5.0
index f8e577fe5133..c1d43e048fe7 100644
--- a/metadata/md5-cache/games-puzzle/shaaft-0.5.0
+++ b/metadata/md5-cache/games-puzzle/shaaft-0.5.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=virtual/opengl sys-libs/zlib media-libs/libpng:0 media-libs/libsdl[sound,opengl,video] media-libs/sdl-mixer[mod] media-libs/sdl-image[png] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A falling block game similar to Blockout
-EAPI=2
+EAPI=5
 HOMEPAGE=http://packages.gentoo.org/package/games-puzzle/shaaft
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=virtual/opengl sys-libs/zlib media-libs/libpng:0 media-libs/libsdl[sound
 SLOT=0
 SRC_URI=mirror://sourceforge/criticalmass/Shaaft-0.5.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=3f3668235f4c78897bec85e86bf2a0a6
+_md5_=eae5e751f1ee15b9801e4edb1ef95529
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.2.2 b/metadata/md5-cache/games-puzzle/tanglet-1.2.2
deleted file mode 100644
index 4a5e6e3d1855..000000000000
--- a/metadata/md5-cache/games-puzzle/tanglet-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/zlib dev-qt/qtcore:4 dev-qt/qtgui:4 >=sys-apps/sed-4
-DESCRIPTION=A single player word finding game based on Boggle
-EAPI=5
-HOMEPAGE=http://gottcode.org/tanglet/
-IUSE=linguas_cs linguas_de linguas_es linguas_en linguas_fr linguas_he linguas_hu linguas_it linguas_nl linguas_ro linguas_tr linguas_uk linguas_es
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/zlib dev-qt/qtcore:4 dev-qt/qtgui:4 games-misc/games-envd
-SLOT=0
-SRC_URI=http://gottcode.org/tanglet/tanglet-1.2.2-src.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2e73f8178d1f6a0c2bd1891409ac2023
diff --git a/metadata/md5-cache/games-puzzle/tetrinet-0.11 b/metadata/md5-cache/games-puzzle/tetrinet-0.11
index 5a78ff4e95c5..d544a0b0b084 100644
--- a/metadata/md5-cache/games-puzzle/tetrinet-0.11
+++ b/metadata/md5-cache/games-puzzle/tetrinet-0.11
@@ -4,10 +4,10 @@ DESCRIPTION=console based tetrinet inc. standalone server
 EAPI=5
 HOMEPAGE=http://tetrinet.or.cz/
 IUSE=ipv6
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=public-domain
 RDEPEND=>=sys-libs/ncurses-5 games-misc/games-envd
 SLOT=0
 SRC_URI=http://tetrinet.or.cz/download/tetrinet-0.11.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=279b6a0682f95b96204bec63e7d11d64
+_md5_=8e2d70238f3608867784e2206936eb60
diff --git a/metadata/md5-cache/games-puzzle/textmaze-1.2 b/metadata/md5-cache/games-puzzle/textmaze-1.2
index 611bf193ba98..1927a28a35b9 100644
--- a/metadata/md5-cache/games-puzzle/textmaze-1.2
+++ b/metadata/md5-cache/games-puzzle/textmaze-1.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=An ncurses-based maze solving game written in Perl
 EAPI=5
 HOMEPAGE=http://robobunny.com/projects/textmaze/html/
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Curses games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.robobunny.com/projects/textmaze/textmaze_v1.2.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a8f9538249fe9bd3526f8fe3a5737ab8
+_md5_=2ec74026334d11302bb3733e279f134b
diff --git a/metadata/md5-cache/games-puzzle/tod-0 b/metadata/md5-cache/games-puzzle/tod-0
index eab08084008f..4d2705580a82 100644
--- a/metadata/md5-cache/games-puzzle/tod-0
+++ b/metadata/md5-cache/games-puzzle/tod-0
@@ -3,10 +3,10 @@ DEPEND=media-libs/allegro:0[X] app-arch/unzip
 DESCRIPTION=Tetanus On Drugs simulates playing a Tetris clone under the influence of hallucinogenic drugs
 EAPI=5
 HOMEPAGE=http://www.pineight.com/tod/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/allegro:0[X] games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.pineight.com/pc/wintod.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d04c06626c911a8694779892fd5e4ea1
+_md5_=a88d04c5f998b25362895346cbf75ba9
diff --git a/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.1 b/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.1
deleted file mode 100644
index c8312112c4a8..000000000000
--- a/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto >=sys-apps/sed-4
-DESCRIPTION=wmpuzzle provides a 4x4 puzzle on a 64x64 mini window
-EAPI=5
-HOMEPAGE=http://freecode.com/projects/wmpuzzle
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm games-misc/games-envd
-SLOT=0
-SRC_URI=http://people.debian.org/~godisch/wmpuzzle/wmpuzzle-0.5.1.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9c7205c5eb45445c6e92c56b9a52b6ba
diff --git a/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0 b/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0
new file mode 100644
index 000000000000..231da0ec3e5b
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/gtk+:2 gnome-base/libglade sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] ) lua? ( dev-lang/lua ) net-misc/curl media-libs/libpng:0 sys-libs/zlib virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=Client for the nethack-style but more in the line of UO
+EAPI=5
+HOMEPAGE=http://crossfire.real-time.com/
+IUSE=alsa lua opengl oss sdl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/gtk+:2 gnome-base/libglade sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] ) lua? ( dev-lang/lua ) net-misc/curl media-libs/libpng:0 sys-libs/zlib games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/crossfire/crossfire-client-1.71.0.tar.bz2
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=f81b6407a6c95546a42f401f2432bcbc
diff --git a/metadata/md5-cache/games-roguelike/ivan-0.50 b/metadata/md5-cache/games-roguelike/ivan-0.50
index 8c157113df0e..b814a333dd9e 100644
--- a/metadata/md5-cache/games-roguelike/ivan-0.50
+++ b/metadata/md5-cache/games-roguelike/ivan-0.50
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl
+DEPEND=media-libs/libsdl[video]
 DESCRIPTION=Rogue-like game with SDL graphics
-EAPI=2
+EAPI=5
 HOMEPAGE=http://ivan.sourceforge.net/
 KEYWORDS=~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=media-libs/libsdl games-misc/games-envd
+RDEPEND=media-libs/libsdl[video] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/ivan/ivan-0.50.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1c8bf139a267ebd5209bef7e0cc4f477
+_md5_=ed9a209251a3b92603c9c36ced8ccafb
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.5.5 b/metadata/md5-cache/games-roguelike/tomenet-4.5.5
deleted file mode 100644
index c46128285c8b..000000000000
--- a/metadata/md5-cache/games-roguelike/tomenet-4.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) virtual/pkgconfig !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) ) >=sys-apps/sed-4
-DESCRIPTION=A MMORPG based on the works of J.R.R. Tolkien
-EAPI=5
-HOMEPAGE=http://www.tomenet.net/
-IUSE=dedicated server +sound X
-KEYWORDS=~amd64 ~x86
-LICENSE=Moria
-RDEPEND=sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.tomenet.net/downloads/tomenet-4.5.5.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=4dafeb64ba3097f62228d082b8b30743
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608 b/metadata/md5-cache/games-rpg/dear-esther-20130608
index 424f18916dce..e6f30c9fb8fe 100644
--- a/metadata/md5-cache/games-rpg/dear-esther-20130608
+++ b/metadata/md5-cache/games-rpg/dear-esther-20130608
@@ -3,11 +3,11 @@ DEPEND=app-arch/unzip >=sys-apps/sed-4
 DESCRIPTION=Ghost story, told using first-person gaming technologies
 EAPI=5
 HOMEPAGE=http://dear-esther.com/
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=|| ( ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) amd64? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) ) games-misc/games-envd
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dearesther-linux-06082013-bin
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=184d3338b182c1d47fce0885effec043
+_md5_=94543cb536b88154f1c461ff5878f957
diff --git a/metadata/md5-cache/games-rpg/freedink-108.4 b/metadata/md5-cache/games-rpg/freedink-108.4
index 0bb9406a2e08..4c45c9c6afd0 100644
--- a/metadata/md5-cache/games-rpg/freedink-108.4
+++ b/metadata/md5-cache/games-rpg/freedink-108.4
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,vide
 DESCRIPTION=Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)
 EAPI=5
 HOMEPAGE=http://www.freedink.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 ~games-rpg/freedink-data-1.08.20140901 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gnu/freedink/freedink-108.4.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1b91479333aa0243b6df603b71186865
+_md5_=30ef8b20c6a03ff6a62444cb650e4761
diff --git a/metadata/md5-cache/games-rpg/valyriatear-1.0.0 b/metadata/md5-cache/games-rpg/valyriatear-1.0.0
index ced4ec8bd5ff..0d1e758b1187 100644
--- a/metadata/md5-cache/games-rpg/valyriatear-1.0.0
+++ b/metadata/md5-cache/games-rpg/valyriatear-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A free 2D J-RPG based on the Hero of Allacrost engine
 EAPI=5
 HOMEPAGE=http://valyriatear.blogspot.de/ https://github.com/Bertram25/ValyriaTear
 IUSE=debug editor nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 GPL-2+ GPL-3 CC-BY-SA-3.0 CC-BY-3.0 CC0-1.0 OFL-1.1
 RDEPEND=dev-cpp/luabind dev-lang/lua media-libs/libpng:0= media-libs/libsdl[X,joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl-image[png] media-libs/sdl-ttf virtual/glu virtual/opengl x11-libs/libX11 editor? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) nls? ( virtual/libintl ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/Bertram25/ValyriaTear/archive/1.0.0/valyriatear-1.0.0.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2e66c6b4c9a9ff700f3df7de0372a8ee
+_md5_=9356890162cf2dce53706a8565f3684f
diff --git a/metadata/md5-cache/games-server/crossfire-server-1.71.0 b/metadata/md5-cache/games-server/crossfire-server-1.71.0
new file mode 100644
index 000000000000..3779719d5e81
--- /dev/null
+++ b/metadata/md5-cache/games-server/crossfire-server-1.71.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0 )
+DESCRIPTION=server for the crossfire clients
+EAPI=5
+HOMEPAGE=http://crossfire.real-time.com/
+IUSE=X
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0 ) games-misc/games-envd
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.maps.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.arch.tar.bz2
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=0f70e693a50658420f8dee79aa17398e
diff --git a/metadata/md5-cache/games-simulation/crashtest-1.1 b/metadata/md5-cache/games-simulation/crashtest-1.1
index 21a4c8b0a63a..6ceb5119996a 100644
--- a/metadata/md5-cache/games-simulation/crashtest-1.1
+++ b/metadata/md5-cache/games-simulation/crashtest-1.1
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/fltk:1[opengl] dev-games/ode media-libs/alsa-lib virtual/opengl
 SLOT=0
 SRC_URI=http://www.stolk.org/crashtest/crashtest-1.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9db8162503d0b9eb838a2d9e5e1b307c
+_md5_=6c1ac425beab19f61019518c108f8fb1
diff --git a/metadata/md5-cache/games-simulation/openttd-1.4.4 b/metadata/md5-cache/games-simulation/openttd-1.4.4
index 7d0b6009a93a..05a0e47759fe 100644
--- a/metadata/md5-cache/games-simulation/openttd-1.4.4
+++ b/metadata/md5-cache/games-simulation/openttd-1.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
 EAPI=5
 HOMEPAGE=http://www.openttd.org/
 IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.7 )
 RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) games-misc/games-envd
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://binaries.openttd.org/releases/1.4.4/openttd-1.4.4-source.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=177c0862c2b71c00b0e381bff524cbdc
+_md5_=13b0b5f6986754af594d6a6e04599182
diff --git a/metadata/md5-cache/games-simulation/senken-0.3.0 b/metadata/md5-cache/games-simulation/senken-0.3.0
index 5d094ae903b5..b36e189cd682 100644
--- a/metadata/md5-cache/games-simulation/senken-0.3.0
+++ b/metadata/md5-cache/games-simulation/senken-0.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=x11-libs/gtk+:2 >=media-libs/libsdl-1.2.4 media-libs/sdl-image nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
 DESCRIPTION=city simulation game
 EAPI=5
-HOMEPAGE=http://www.contrib.andrew.cmu.edu/~tmartin/senken/
+HOMEPAGE=http://savannah.nongnu.org/projects/senken/
 IUSE=nls
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/gtk+:2 >=media-libs/libsdl-1.2.4 media-libs/sdl-image nls? ( vi
 SLOT=0
 SRC_URI=mirror://gentoo/senken-0.3.0.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=820ea4461a50f8127b44b4eade89dd66
+_md5_=b803a8e77008f50dc2ff93db9438bb12
diff --git a/metadata/md5-cache/games-simulation/singularity-0.30c b/metadata/md5-cache/games-simulation/singularity-0.30c
deleted file mode 100644
index 5e7139e639e0..000000000000
--- a/metadata/md5-cache/games-simulation/singularity-0.30c
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND==dev-lang/python-2* dev-python/pygame dev-python/numpy media-libs/sdl-mixer[vorbis] app-arch/unzip
-DESCRIPTION=A simulation of a true AI. Go from computer to computer, pursued by the entire world
-EAPI=2
-HOMEPAGE=http://www.emhsoft.com/singularity/
-IUSE=+music
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 CC-BY-SA-2.5
-RDEPEND==dev-lang/python-2* dev-python/pygame dev-python/numpy media-libs/sdl-mixer[vorbis] games-misc/games-envd
-SLOT=0
-SRC_URI=http://endgame-singularity.googlecode.com/files/singularity-0.30c-src.tar.gz music? ( http://endgame-singularity.googlecode.com/files/endgame-singularity-music-006.zip )
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=5cb875366ec4cb35cf3541b916e12bf6
diff --git a/metadata/md5-cache/games-sports/torcs-1.3.4 b/metadata/md5-cache/games-sports/torcs-1.3.4
deleted file mode 100644
index 7bde88e9a803..000000000000
--- a/metadata/md5-cache/games-sports/torcs-1.3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis media-libs/openal >=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-proto/xf86vidmodeproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Open Racing Car Simulator
-EAPI=5
-HOMEPAGE=http://torcs.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 FreeArt
-RDEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis media-libs/openal >=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/torcs/torcs-1.3.4.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2b60212f77f7177fd4908662a2094f2a
diff --git a/metadata/md5-cache/games-sports/vdrift-20111022 b/metadata/md5-cache/games-sports/vdrift-20111022
deleted file mode 100644
index 5c2bdebf6b93..000000000000
--- a/metadata/md5-cache/games-sports/vdrift-20111022
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/libarchive media-libs/glew media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/libvorbis net-misc/curl sci-physics/bullet[-double-precision] virtual/opengl virtual/glu dev-cpp/asio dev-libs/boost virtual/pkgconfig dev-util/scons
-DESCRIPTION=A driving simulation made with drift racing in mind
-EAPI=2
-HOMEPAGE=http://vdrift.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3 ZLIB
-RDEPEND=app-arch/libarchive media-libs/glew media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/libvorbis net-misc/curl sci-physics/bullet[-double-precision] virtual/opengl virtual/glu games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/vdrift/vdrift-2011-10-22.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b9589cb1098d44580f734796b5f0a787
diff --git a/metadata/md5-cache/games-strategy/asc-2.5.0.0 b/metadata/md5-cache/games-strategy/asc-2.5.0.0
deleted file mode 100644
index 47fe0e4b7525..000000000000
--- a/metadata/md5-cache/games-strategy/asc-2.5.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/bzip2 media-libs/libsdl media-libs/libpng media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound dev-libs/boost dev-games/physfs media-libs/xvid dev-libs/expat media-libs/freetype dev-lang/lua x11-libs/wxGTK:2.8[X] dev-libs/libsigc++:1.2 dev-lang/perl virtual/pkgconfig app-arch/zip
-DESCRIPTION=turn based strategy game designed in the tradition of the Battle Isle series
-EAPI=4
-HOMEPAGE=http://www.asc-hq.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 media-libs/libsdl media-libs/libpng media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound dev-libs/boost dev-games/physfs media-libs/xvid dev-libs/expat media-libs/freetype dev-lang/lua x11-libs/wxGTK:2.8[X] dev-libs/libsigc++:1.2 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/asc-hq/asc-2.5.0.0.tar.bz2 http://www.asc-hq.org/music/frontiers.ogg http://www.asc-hq.org/music/time_to_strike.ogg http://www.asc-hq.org/music/machine_wars.ogg
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=3893f1ad9f2dbcf3fb90f010055f5266
diff --git a/metadata/md5-cache/games-strategy/dark-oberon-1.0.2_rc1 b/metadata/md5-cache/games-strategy/dark-oberon-1.0.2_rc1
index 2cb7416abc51..2b37d5d35fab 100644
--- a/metadata/md5-cache/games-strategy/dark-oberon-1.0.2_rc1
+++ b/metadata/md5-cache/games-strategy/dark-oberon-1.0.2_rc1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=virtual/opengl virtual/glu media-libs/glfw fmod? ( =media-libs/fmod-3* )
 DESCRIPTION=a Warcraft like RTS game
-EAPI=2
+EAPI=5
 HOMEPAGE=http://dark-oberon.sourceforge.net/
 IUSE=fmod
 KEYWORDS=~x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu media-libs/glfw fmod? ( =media-libs/fmod-3* ) games-misc/games-envd
+RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/dark-oberon/dark-oberon-1.0.2-RC1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=3c11e68c0e9c2efbbc500a0682905759
+_md5_=50727307a07fdc73916d5611cbfc3e8f
diff --git a/metadata/md5-cache/games-strategy/freecol-0.10.7 b/metadata/md5-cache/games-strategy/freecol-0.10.7
index 10a0e0e4eca2..2aecf87d7d10 100644
--- a/metadata/md5-cache/games-strategy/freecol-0.10.7
+++ b/metadata/md5-cache/games-strategy/freecol-0.10.7
@@ -4,10 +4,10 @@ DESCRIPTION=An open source clone of the game Colonization
 EAPI=5
 HOMEPAGE=http://www.freecol.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.1.9-r1 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freecol/freecol-0.10.7-src.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2403563e4fe37de4e304876d0c4951de
+_md5_=febaa139efef8af5f10dd017226f59f0
diff --git a/metadata/md5-cache/games-strategy/freesynd-0.7.1 b/metadata/md5-cache/games-strategy/freesynd-0.7.1
index 587028b0f3bc..2e07e19fc644 100644
--- a/metadata/md5-cache/games-strategy/freesynd-0.7.1
+++ b/metadata/md5-cache/games-strategy/freesynd-0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=A cross-platform reimplementation of engine for the classic Bullfrog
 EAPI=5
 HOMEPAGE=http://freesynd.sourceforge.net/
 IUSE=debug devtools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libogg media-libs/libpng:0 media-libs/libsdl[X,sound,video] media-libs/libvorbis media-libs/sdl-mixer[mp3,vorbis] media-libs/sdl-image[png] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freesynd/freesynd-0.7.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=546786171621a267912eca782763a187
+_md5_=3e05c00740ed514c02bdd936a3ab2055
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.2.3 b/metadata/md5-cache/games-strategy/lgeneral-1.2.3
deleted file mode 100644
index eca209cc17a0..000000000000
--- a/metadata/md5-cache/games-strategy/lgeneral-1.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Panzer General clone written in SDL
-EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LGeneral
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.2.3.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0940f68b9362ed0363f89f4d4bad328c
diff --git a/metadata/md5-cache/games-strategy/netpanzer-0.8.2 b/metadata/md5-cache/games-strategy/netpanzer-0.8.2
index 2ceea02f0497..444c5e224ed6 100644
--- a/metadata/md5-cache/games-strategy/netpanzer-0.8.2
+++ b/metadata/md5-cache/games-strategy/netpanzer-0.8.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dedicated? ( app-misc/screen ) media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image dev-games/physfs dev-util/ftjam
+DEPEND=dedicated? ( app-misc/screen ) media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image dev-games/physfs dev-util/ftjam
 DESCRIPTION=Fast-action multiplayer strategic network game
-EAPI=4
-HOMEPAGE=http://netpanzer.berlios.de/
+EAPI=5
+HOMEPAGE=http://www.netpanzer.info/
 IUSE=dedicated
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=ppc x86
 LICENSE=GPL-2
-RDEPEND=dedicated? ( app-misc/screen ) media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image dev-games/physfs games-misc/games-envd
+RDEPEND=dedicated? ( app-misc/screen ) media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image dev-games/physfs games-misc/games-envd
 SLOT=0
-SRC_URI=mirror://berlios/netpanzer/netpanzer-0.8.2.tar.bz2 mirror://berlios/netpanzer/netpanzer-data-0.8.tar.bz2
+SRC_URI=mirror://sourceforge/netpanzer.berlios/netpanzer-0.8.2.tar.bz2 mirror://sourceforge/netpanzer.berlios/netpanzer-data-0.8.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d70c0ea3f1b0960e37e0ccfd0ea0cc3c
+_md5_=a186519faeb8d0157d9093844089f3d3
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.8.1 b/metadata/md5-cache/games-strategy/s25rttr-0.8.1
index 744b55848a70..78e0c49ab145 100644
--- a/metadata/md5-cache/games-strategy/s25rttr-0.8.1
+++ b/metadata/md5-cache/games-strategy/s25rttr-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Open Source remake of The Settlers II game (needs original game file
 EAPI=5
 HOMEPAGE=http://www.siedler25.org/
 IUSE=debug glfw
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 media-libs/libsamplerate media-libs/libsdl[X,sound,opengl,video] media-libs/libsndfile media-libs/sdl-mixer[vorbis] net-libs/miniupnpc virtual/libiconv virtual/opengl glfw? ( <media-libs/glfw-3 ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/s25rttr-0.8.1.tar.xz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=98c6c944331e375284693752af54806d
+_md5_=12fc45b6d1b15bdc9328479cc2511fda
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 445dbb6848bb..7958c9510424 100644
--- a/metadata/md5-cache/games-strategy/uqm-0.7.0-r2
+++ b/metadata/md5-cache/games-strategy/uqm-0.7.0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4 media-libs/libsdl[X,sound,joystick,video] media-libs/libvorbis media-libs/sdl-image[png] sys-libs/zlib opengl? ( virtual/opengl ) virtual/pkgconfig
 DESCRIPTION=The Ur-Quan Masters: Port of Star Control 2
-EAPI=2
+EAPI=5
 HOMEPAGE=http://sc2.sourceforge.net/
 IUSE=music opengl remix voice
 KEYWORDS=amd64 ppc ppc64 x86
@@ -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	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b4e442a6ab4798bb6662994f8a1b1c7e
+_md5_=ccb9bd8d93908b80cdf6a50dd4b7ca88
diff --git a/metadata/md5-cache/games-util/gslist-0.8.8a b/metadata/md5-cache/games-util/gslist-0.8.8a
index 3a9f0c2e7f1d..b6270e7708ed 100644
--- a/metadata/md5-cache/games-util/gslist-0.8.8a
+++ b/metadata/md5-cache/games-util/gslist-0.8.8a
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=dev-libs/geoip app-arch/unzip
 DESCRIPTION=A GameSpy server browser
-EAPI=2
+EAPI=5
 HOMEPAGE=http://aluigi.altervista.org/papers.htm#gslist
 IUSE=web
 KEYWORDS=amd64 ~hppa x86
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/geoip games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/gslist-0.8.8a.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a354261bb943b079312d78f7da3f5ecf
+_md5_=94cf450b44d58b10c4616659aa980338
diff --git a/metadata/md5-cache/games-util/higan-purify-03 b/metadata/md5-cache/games-util/higan-purify-03
index 3fd9a3b1ff5d..c26e9318e6c7 100644
--- a/metadata/md5-cache/games-util/higan-purify-03
+++ b/metadata/md5-cache/games-util/higan-purify-03
@@ -4,10 +4,10 @@ DESCRIPTION=Rom purifier for higan
 EAPI=5
 HOMEPAGE=http://byuu.org/higan/
 IUSE=qt4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-games/higan-ananke x11-libs/libX11 !qt4? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.5:4 )
 SLOT=0
 SRC_URI=http://higan.googlecode.com/files/purify_v03-source.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3569ac086ed4d83e0dd6e7d5c694c13c
+_md5_=476d173df3da59614c50a9ecb39ce0e5
diff --git a/metadata/md5-cache/games-util/joystick-1.4.7 b/metadata/md5-cache/games-util/joystick-1.4.7
deleted file mode 100644
index f52018908212..000000000000
--- a/metadata/md5-cache/games-util/joystick-1.4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
-DESCRIPTION=joystick testing utilities
-EAPI=5
-HOMEPAGE=http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
-IUSE=sdl
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
-SLOT=0
-SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.4.7.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=13aef6c379e3c9a40c1cd511757f0d84
diff --git a/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12 b/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
index 4ef16ea2d477..a6a3d8d1e750 100644
--- a/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
+++ b/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 virtual/pkgconfig
 DESCRIPTION=WBFS manager for Linux using GTK+
 EAPI=5
 HOMEPAGE=http://code.google.com/p/linux-wbfs-manager/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
 SLOT=0
 SRC_URI=http://linux-wbfs-manager.googlecode.com/files/linux-wbfs-manager-0.1.12.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=160da462c03dffe9c550a1ac6dca391a
+_md5_=80ab554504fbe96f1bd8f3014ad1f56c
diff --git a/metadata/md5-cache/games-util/loki_patch-20091105 b/metadata/md5-cache/games-util/loki_patch-20091105
index 3398e316c230..777b375e1f71 100644
--- a/metadata/md5-cache/games-util/loki_patch-20091105
+++ b/metadata/md5-cache/games-util/loki_patch-20091105
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Loki Software binary patch tool
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.icculus.org/loki_setup/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://gentoo/loki_patch-20091105.tar.bz2 mirror://gentoo/loki_setupdb-20091105.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=24080a10e82728411599e64b4e70462a
+_md5_=002d708dd8df79bc82366be671a73d26
diff --git a/metadata/md5-cache/games-util/lutris-0.3.6.1 b/metadata/md5-cache/games-util/lutris-0.3.6.1
index 912a5f123998..7dcd8e22b8b8 100644
--- a/metadata/md5-cache/games-util/lutris-0.3.6.1
+++ b/metadata/md5-cache/games-util/lutris-0.3.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Gaming platform for GNU/Linux
 EAPI=5
 HOMEPAGE=http://lutris.net/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/gvfs[http] x11-apps/xrandr x11-apps/xgamma x11-misc/xdg-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] games-misc/games-envd
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lutris/lutris/archive/v0.3.6.1.tar.gz -> lutris-0.3.6.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=80822327c0bf13025f71ccaf69789be9
+_md5_=6b156662d02a496b3d36c048856b5814
diff --git a/metadata/md5-cache/games-util/wiiload-0.5 b/metadata/md5-cache/games-util/wiiload-0.5
index e7b118b4d818..c32f1379e439 100644
--- a/metadata/md5-cache/games-util/wiiload-0.5
+++ b/metadata/md5-cache/games-util/wiiload-0.5
@@ -1,9 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=load homebrew apps over the network to your Wii
+EAPI=5
 HOMEPAGE=http://wiibrew.org/wiki/Wiiload
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/wiiload-0.5.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=68345b2df27d90c16cfda47b856ae631
+_md5_=82309ce21af1b05bd6bbb81c6b353a57
diff --git a/metadata/md5-cache/kde-base/ark-4.14.3 b/metadata/md5-cache/kde-base/ark-4.14.3
deleted file mode 100644
index 04ab02e3c9d6..000000000000
--- a/metadata/md5-cache/kde-base/ark-4.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/libkonq-4.14.3:4[aqua=] sys-libs/zlib archive? ( >=app-arch/libarchive-2.6.1:=[bzip2?,lzma?,zlib] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
-DESCRIPTION=KDE Archiving tool
-EAPI=5
-HOMEPAGE=http://www.kde.org/applications/utilities/ark http://utils.kde.org/projects/ark
-IUSE=+archive +bzip2 debug lzma +handbook aqua
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/libkonq-4.14.3:4[aqua=] sys-libs/zlib archive? ( >=app-arch/libarchive-2.6.1:=[bzip2?,lzma?,zlib] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.14.3: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.14.3:4[aqua=]
-RESTRICT=test
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/4.14.3/src/ark-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4d496844d84705ac037b27b608c3cd05
diff --git a/metadata/md5-cache/kde-base/freespacenotifier-4.11.9 b/metadata/md5-cache/kde-base/freespacenotifier-4.11.9
deleted file mode 100644
index a18b55489b73..000000000000
--- a/metadata/md5-cache/kde-base/freespacenotifier-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=A module that monitors free disk space on the home dir
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0005c185b34981c24b55ab9bccabb390
diff --git a/metadata/md5-cache/kde-base/kcheckpass-4.11.9 b/metadata/md5-cache/kde-base/kcheckpass-4.11.9
deleted file mode 100644
index 03f101c853df..000000000000
--- a/metadata/md5-cache/kde-base/kcheckpass-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=A simple password checker, used by any software in need of user authentication
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug pam aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b3bd6a523bf524d0529261d9f2739aa3
diff --git a/metadata/md5-cache/kde-base/kcminit-4.11.9 b/metadata/md5-cache/kde-base/kcminit-4.11.9
deleted file mode 100644
index 675bc8c00695..000000000000
--- a/metadata/md5-cache/kde-base/kcminit-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KCMInit - runs startups initialization for Control Modules
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6e7d6a49047cff1cc3a9990eb2eb36cd
diff --git a/metadata/md5-cache/kde-base/kdebase-cursors-4.11.9 b/metadata/md5-cache/kde-base/kdebase-cursors-4.11.9
deleted file mode 100644
index d634d275744d..000000000000
--- a/metadata/md5-cache/kde-base/kdebase-cursors-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=oxygen cursors from kdebase
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=80e2ba121808a3c3ed93500f4d63c5a9
diff --git a/metadata/md5-cache/kde-base/kdebase-startkde-4.11.9 b/metadata/md5-cache/kde-base/kdebase-startkde-4.11.9
deleted file mode 100644
index 5ea2954cbbac..000000000000
--- a/metadata/md5-cache/kde-base/kdebase-startkde-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=Startkde script, which starts a complete KDE session, and associated scripts
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=+wallpapers aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kcminit-4.11.9:4[aqua=] >=kde-base/kdebase-runtime-meta-4.11.9:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.11.9:4[aqua=] ) >=kde-base/kfmclient-4.11.9:4[aqua=] >=kde-base/knotify-4.11.9:4[aqua=] >=kde-base/kreadconfig-4.11.9:4[aqua=] >=kde-base/krunner-4.11.9:4[aqua=] >=kde-base/ksmserver-4.11.9:4[aqua=] >=kde-base/ksplash-4.11.9:4[aqua=] >=kde-base/kstartupconfig-4.11.9:4[aqua=] >=kde-base/kwin-4.11.9:4[aqua=] >=kde-base/phonon-kde-4.11.9:4[aqua=] >=kde-base/plasma-apps-4.11.9:4[aqua=] >=kde-base/plasma-workspace-4.11.9:4[aqua=] >=kde-base/systemsettings-4.11.9:4[aqua=] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xsetroot x11-apps/xset || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f4355c780da2e0441f4b53b7b05f2b51
diff --git a/metadata/md5-cache/kde-base/kdm-4.11.9-r1 b/metadata/md5-cache/kde-base/kdm-4.11.9-r1
deleted file mode 100644
index 00101008f1b1..000000000000
--- a/metadata/md5-cache/kde-base/kdm-4.11.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/libkworkspace-4.11.9:4[aqua=] media-libs/qimageblitz x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXtst consolekit? ( >=sys-apps/dbus-1.0.2 sys-auth/consolekit ) kerberos? ( virtual/krb5 ) pam? ( >=kde-base/kcheckpass-4.11.9:4[aqua=] virtual/pam ) systemd? ( sys-apps/systemd ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KDE login manager, similar to xdm and gdm
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug +consolekit kerberos pam systemd +handbook aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/libkworkspace-4.11.9:4[aqua=] media-libs/qimageblitz x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXtst consolekit? ( >=sys-apps/dbus-1.0.2 sys-auth/consolekit ) kerberos? ( virtual/krb5 ) pam? ( >=kde-base/kcheckpass-4.11.9:4[aqua=] virtual/pam ) systemd? ( sys-apps/systemd ) >=kde-base/kdepasswd-4.11.9:4[aqua=] >=x11-apps/xinit-1.0.5-r2 x11-apps/xmessage || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.11.9: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.11.9:4[aqua=]
-REQUIRED_USE=consolekit? ( !systemd ) systemd? ( !consolekit )
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=19a2a9c94cdc9f7e64125bfa4e6c288b
diff --git a/metadata/md5-cache/kde-base/kephal-4.11.9 b/metadata/md5-cache/kde-base/kephal-4.11.9
deleted file mode 100644
index 89d667eecfe0..000000000000
--- a/metadata/md5-cache/kde-base/kephal-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-proto/randrproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=Allows handling of multihead systems via the XRandR extension
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXrandr || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5e17d24a974f68111bbf6bf8034727e8
diff --git a/metadata/md5-cache/kde-base/khotkeys-4.11.9 b/metadata/md5-cache/kde-base/khotkeys-4.11.9
deleted file mode 100644
index 5083115dd1cb..000000000000
--- a/metadata/md5-cache/kde-base/khotkeys-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/libkworkspace-4.11.9:4[aqua=] x11-libs/libX11 x11-libs/libXtst >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KDE: hotkey daemon
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/libkworkspace-4.11.9:4[aqua=] x11-libs/libX11 x11-libs/libXtst || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5ed848d7779e0f213e679e95b58e36e5
diff --git a/metadata/md5-cache/kde-base/kinfocenter-4.11.9 b/metadata/md5-cache/kde-base/kinfocenter-4.11.9
deleted file mode 100644
index 4396c91f5807..000000000000
--- a/metadata/md5-cache/kde-base/kinfocenter-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-apps/pciutils x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=dev-qt/qtopengl-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.11.9:4[aqua=]
-DESCRIPTION=The KDE Info Center
-EAPI=5
-HOMEPAGE=http://www.kde.org/applications/system/kinfocenter/
-IUSE=debug ieee1394 opengl +handbook aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) sys-apps/usbutils || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.11.9:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ae2c5932bf700b56ef7bde83aaf28437
diff --git a/metadata/md5-cache/kde-base/klipper-4.11.9 b/metadata/md5-cache/kde-base/klipper-4.11.9
deleted file mode 100644
index 536d401e8d36..000000000000
--- a/metadata/md5-cache/kde-base/klipper-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/libkworkspace-4.11.9:4[aqua=] >=kde-base/libtaskmanager-4.11.9:4[aqua=] sys-libs/zlib x11-libs/libX11 prison? ( media-libs/prison ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=Applet for KDE and X clipboard management
-EAPI=5
-HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/Klipper
-IUSE=debug prison +handbook aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/libkworkspace-4.11.9:4[aqua=] >=kde-base/libtaskmanager-4.11.9:4[aqua=] sys-libs/zlib x11-libs/libX11 prison? ( media-libs/prison ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d102afd2e6a3bcd81e68025f43ccf8e0
diff --git a/metadata/md5-cache/kde-base/kmenuedit-4.11.9 b/metadata/md5-cache/kde-base/kmenuedit-4.11.9
deleted file mode 100644
index 22ed9ead4b7d..000000000000
--- a/metadata/md5-cache/kde-base/kmenuedit-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/khotkeys-4.11.9:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KDE menu editor
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug +handbook aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/khotkeys-4.11.9:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=649c511304cd15cef11a465b4d053473
diff --git a/metadata/md5-cache/kde-base/korundum-4.14.3 b/metadata/md5-cache/kde-base/korundum-4.14.3
deleted file mode 100644
index aa5f11b06ac0..000000000000
--- a/metadata/md5-cache/kde-base/korundum-4.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/qtruby-4.14.3:4[aqua=,ruby_targets_ruby19] >=kde-base/smokekde-4.14.3:4[aqua=,akonadi?,kate?,okular?,nepomuk?] >=kde-base/smokeqt-4.14.3:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtopengl-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.14.3:4[aqua=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-DESCRIPTION=KDE Ruby bindings
-EAPI=5
-HOMEPAGE=http://techbase.kde.org/Development/Languages/Ruby
-IUSE=akonadi debug kate nepomuk okular aqua elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/qtruby-4.14.3:4[aqua=,ruby_targets_ruby19] >=kde-base/smokekde-4.14.3:4[aqua=,akonadi?,kate?,okular?,nepomuk?] >=kde-base/smokeqt-4.14.3:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) >=dev-qt/qtopengl-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.14.3:4[aqua=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/4.14.3/src/korundum-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c539c2fed40a0916c93cd9a661d37eec
diff --git a/metadata/md5-cache/kde-base/korundum-4.14.3-r1 b/metadata/md5-cache/kde-base/korundum-4.14.3-r1
index 844680739e6c..5bceec8f9a2d 100644
--- a/metadata/md5-cache/kde-base/korundum-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/korundum-4.14.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Ruby bindings
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Ruby
 IUSE=akonadi debug kate nepomuk okular aqua elibc_FreeBSD ruby_targets_ruby20
-KEYWORDS=~amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/qtruby-4.14.3:4[aqua=,ruby_targets_ruby20] >=kde-base/smokekde-4.14.3:4[aqua=,akonadi?,kate?,okular?,nepomuk?] >=kde-base/smokeqt-4.14.3:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) >=dev-qt/qtopengl-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.14.3:4[aqua=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/korundum-4.14.3.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c1bdaf3da5a2db97a4d5b16bbc8d57a7
+_md5_=82d3c9659b0a0c583b9ff0d7fd90f674
diff --git a/metadata/md5-cache/kde-base/krossruby-4.14.3 b/metadata/md5-cache/kde-base/krossruby-4.14.3
deleted file mode 100644
index f0e2435d4ecb..000000000000
--- a/metadata/md5-cache/kde-base/krossruby-4.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) 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.14.3:4[aqua=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-DESCRIPTION=Kross scripting framework: Ruby interpreter
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3: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.14.3:4[aqua=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/4.14.3/src/kross-interpreters-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f1eddf0149644b82020c6bd32c6cd4e2
diff --git a/metadata/md5-cache/kde-base/krossruby-4.14.3-r1 b/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
index 04f70644d459..ccac19bc54cc 100644
--- a/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Kross scripting framework: Ruby interpreter
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua elibc_FreeBSD ruby_targets_ruby20
-KEYWORDS=~amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3: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.14.3:4[aqua=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kross-interpreters-4.14.3.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=60c5c7b58b1f500aa25d20b7ac96cce4
+_md5_=15c4fdf7e1b1e3b72934d45cd87cf360
diff --git a/metadata/md5-cache/kde-base/krunner-4.11.9 b/metadata/md5-cache/kde-base/krunner-4.11.9
deleted file mode 100644
index 85bd4302d644..000000000000
--- a/metadata/md5-cache/kde-base/krunner-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kcheckpass-4.11.9:4[aqua=] >=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/ksmserver-4.11.9:4[aqua=] >=kde-base/ksysguard-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] >=kde-base/libplasmagenericshell-4.11.9:4[aqua=] !aqua? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=dev-qt/qtopengl-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.11.9:4[aqua=]
-DESCRIPTION=KDE Command Runner
-EAPI=5
-HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/Plasma/Krunner
-IUSE=debug opengl aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kcheckpass-4.11.9:4[aqua=] >=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/ksmserver-4.11.9:4[aqua=] >=kde-base/ksysguard-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] >=kde-base/libplasmagenericshell-4.11.9:4[aqua=] !aqua? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) opengl? ( >=dev-qt/qtopengl-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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8394a00f071d431ec8e61d11546ee682
diff --git a/metadata/md5-cache/kde-base/kscreensaver-4.11.9 b/metadata/md5-cache/kde-base/kscreensaver-4.11.9
deleted file mode 100644
index 42c3655583de..000000000000
--- a/metadata/md5-cache/kde-base/kscreensaver-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kcheckpass-4.11.9:4[aqua=] x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KDE screensaver framework
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kcheckpass-4.11.9:4[aqua=] x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ec52a2629467269f5af57cef73cc9360
diff --git a/metadata/md5-cache/kde-base/ksmserver-4.11.9 b/metadata/md5-cache/kde-base/ksmserver-4.11.9
deleted file mode 100644
index f80eb562d9a9..000000000000
--- a/metadata/md5-cache/kde-base/ksmserver-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kcminit-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] media-libs/qimageblitz x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrender >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-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.11.9:4[aqua=]
-DESCRIPTION=The reliable KDE session manager that talks the standard X11R6
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kcminit-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] media-libs/qimageblitz x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrender >=kde-base/kdm-4.11.9:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f9d4f1f44e08bf2680b3f74626a40cb6
diff --git a/metadata/md5-cache/kde-base/ksplash-4.11.9 b/metadata/md5-cache/kde-base/ksplash-4.11.9
deleted file mode 100644
index ca3a8a8fd3eb..000000000000
--- a/metadata/md5-cache/kde-base/ksplash-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext xinerama? ( x11-libs/libXinerama ) xinerama? ( x11-proto/xineramaproto ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-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.11.9:4[aqua=]
-DESCRIPTION=KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 xinerama aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext xinerama? ( x11-libs/libXinerama ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=354928b08514ddb44b51c4ce62f72e3f
diff --git a/metadata/md5-cache/kde-base/kstartupconfig-4.11.9 b/metadata/md5-cache/kde-base/kstartupconfig-4.11.9
deleted file mode 100644
index f84542aef9c7..000000000000
--- a/metadata/md5-cache/kde-base/kstartupconfig-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KDE: Utility to launch applications with special window properties
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7fa6dfdd0bbb269ae70902bb443f80e4
diff --git a/metadata/md5-cache/kde-base/kstyles-4.11.9 b/metadata/md5-cache/kde-base/kstyles-4.11.9
deleted file mode 100644
index b98dd325da25..000000000000
--- a/metadata/md5-cache/kde-base/kstyles-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=kde-base/liboxygenstyle:4= x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KDE: A set of different KDE styles
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=kde-base/liboxygenstyle:4= x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b035056348655d72de2adb52b9384f08
diff --git a/metadata/md5-cache/kde-base/ksysguard-4.11.9 b/metadata/md5-cache/kde-base/ksysguard-4.11.9
deleted file mode 100644
index a3ce98a3f356..000000000000
--- a/metadata/md5-cache/kde-base/ksysguard-4.11.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KSysguard is a network enabled task manager and system monitor application
-EAPI=5
-HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KSysGuard
-IUSE=debug lm_sensors test test test +handbook aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.11.9: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.11.9:4[aqua=]
-RESTRICT=test
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4df6c9beb46ac3c1ac23f22dab4cf7f1
diff --git a/metadata/md5-cache/kde-base/ksystraycmd-4.11.9 b/metadata/md5-cache/kde-base/ksystraycmd-4.11.9
deleted file mode 100644
index d8e88c0bc205..000000000000
--- a/metadata/md5-cache/kde-base/ksystraycmd-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=Ksystraycmd embeds applications given as argument into the system tray
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5209a7e4b69f20f6df3b8c6699223927
diff --git a/metadata/md5-cache/kde-base/kwin-4.11.9 b/metadata/md5-cache/kde-base/kwin-4.11.9
deleted file mode 100644
index b842d58b89ad..000000000000
--- a/metadata/md5-cache/kde-base/kwin-4.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kactivities-4.11.9:4[aqua=] >=kde-base/kdelibs-4.11.9:4[aqua=,opengl] >=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] >=kde-base/liboxygenstyle-4.11.9:4[aqua=] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXrandr-1.2.1 x11-libs/libXrender x11-libs/libXxf86vm opengl? ( >=media-libs/mesa-7.10 ) gles? ( >=media-libs/mesa-7.12[egl(+),gles2] ) wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] ) x11-libs/xcb-util-renderutil x11-proto/compositeproto x11-proto/damageproto x11-proto/fixesproto x11-proto/randrproto x11-proto/renderproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qtopengl-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.11.9:4[aqua=]
-DESCRIPTION=KDE window manager
-EAPI=5
-HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KWin
-IUSE=debug gles opengl wayland aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kactivities-4.11.9:4[aqua=] >=kde-base/kdelibs-4.11.9:4[aqua=,opengl] >=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] >=kde-base/liboxygenstyle-4.11.9:4[aqua=] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXrandr-1.2.1 x11-libs/libXrender x11-libs/libXxf86vm opengl? ( >=media-libs/mesa-7.10 ) gles? ( >=media-libs/mesa-7.12[egl(+),gles2] ) wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] ) x11-apps/scripts || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qtopengl-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.11.9:4[aqua=]
-REQUIRED_USE=!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )
-RESTRICT=test
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e0b87ceb617e30e93ae3bc5700003805
diff --git a/metadata/md5-cache/kde-base/kwrited-4.11.9 b/metadata/md5-cache/kde-base/kwrited-4.11.9
deleted file mode 100644
index a7b2711eb6f3..000000000000
--- a/metadata/md5-cache/kde-base/kwrited-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-libs/libutempter-1.1.5 >=sys-freebsd/freebsd-lib-9.0 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KDE daemon listening for wall and write messages
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-libs/libutempter-1.1.5 >=sys-freebsd/freebsd-lib-9.0 ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=76e39295e5e489050cf38772727dc28f
diff --git a/metadata/md5-cache/kde-base/libkworkspace-4.11.9 b/metadata/md5-cache/kde-base/libkworkspace-4.11.9
deleted file mode 100644
index fa12b28d74d2..000000000000
--- a/metadata/md5-cache/kde-base/libkworkspace-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXau >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=A library for KDE desktop applications
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXau || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a4ffdd6db6101bfbee7ed0bfa425515c
diff --git a/metadata/md5-cache/kde-base/liboxygenstyle-4.11.9 b/metadata/md5-cache/kde-base/liboxygenstyle-4.11.9
deleted file mode 100644
index df274964105a..000000000000
--- a/metadata/md5-cache/kde-base/liboxygenstyle-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=Library to support the Oxygen style in KDE
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11.9
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=23ffb583952c9b27f9c9b4fca8ca3a98
diff --git a/metadata/md5-cache/kde-base/libplasmaclock-4.11.9 b/metadata/md5-cache/kde-base/libplasmaclock-4.11.9
deleted file mode 100644
index 19f19a997cdc..000000000000
--- a/metadata/md5-cache/kde-base/libplasmaclock-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kephal-4.11.9:4[aqua=] semantic-desktop? ( >=kde-base/kdepimlibs-4.11.9:4[aqua=] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=Libraries for KDE Plasma's clocks
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug semantic-desktop aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kephal-4.11.9:4[aqua=] semantic-desktop? ( >=kde-base/kdepimlibs-4.11.9:4[aqua=] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f299dd97d196e612eb15fd6090627ce3
diff --git a/metadata/md5-cache/kde-base/libplasmaclock-4.11.9-r1 b/metadata/md5-cache/kde-base/libplasmaclock-4.11.9-r1
deleted file mode 100644
index 6028656fdcf8..000000000000
--- a/metadata/md5-cache/kde-base/libplasmaclock-4.11.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kephal-4.11.9:4[aqua=] kdepim? ( >=kde-base/kdepimlibs-4.11.9:4[aqua=] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=Libraries for KDE Plasma's clocks
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug +kdepim aqua
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kephal-4.11.9:4[aqua=] kdepim? ( >=kde-base/kdepimlibs-4.11.9:4[aqua=] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0c9ecdbd2f3cde9ed9c77d21db37e56d
diff --git a/metadata/md5-cache/kde-base/libplasmagenericshell-4.11.9 b/metadata/md5-cache/kde-base/libplasmagenericshell-4.11.9
deleted file mode 100644
index e084e007bd80..000000000000
--- a/metadata/md5-cache/kde-base/libplasmagenericshell-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-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.11.9:4[aqua=]
-DESCRIPTION=Libraries for the KDE Plasma shell
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug test aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8b0aee5b35034cf83625938b580cdefc
diff --git a/metadata/md5-cache/kde-base/libtaskmanager-4.11.9 b/metadata/md5-cache/kde-base/libtaskmanager-4.11.9
deleted file mode 100644
index f9ed830ff9d6..000000000000
--- a/metadata/md5-cache/kde-base/libtaskmanager-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kactivities-4.11.9:4[aqua=] >=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/ksysguard-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=A library that provides basic taskmanager functionality
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kactivities-4.11.9:4[aqua=] >=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/ksysguard-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=eb8c81bcdee1f638bb354bddd2802089
diff --git a/metadata/md5-cache/kde-base/plasma-workspace-4.11.9-r1 b/metadata/md5-cache/kde-base/plasma-workspace-4.11.9-r1
deleted file mode 100644
index 5748bb799a4c..000000000000
--- a/metadata/md5-cache/kde-base/plasma-workspace-4.11.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libdbusmenu-qt[qt4(+)] >=dev-qt/qtcore-4.8.4-r3:4 !kde-misc/ktouchpadenabler >=kde-base/kactivities-4.11.9:4[aqua=] >=kde-base/kdelibs-4.11.9:4[aqua=,nepomuk?] >=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/ksysguard-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] >=kde-base/libplasmaclock-4.11.9:4[aqua=,kdepim?] >=kde-base/libplasmagenericshell-4.11.9:4[aqua=] >=kde-base/libtaskmanager-4.11.9:4[aqua=] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender gps? ( >=sci-geosciences/gpsd-2.37 ) json? ( dev-libs/qjson ) kdepim? ( >=kde-base/kdepimlibs-4.11.9:4[aqua=] ) nepomuk? ( dev-libs/soprano >=kde-base/nepomuk-core-4.11.9:4[aqua=] ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/PyQt4-4.4.0[X,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=kde-base/pykde4-4.11.9:4[aqua=,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) qalculate? ( sci-libs/libqalculate ) dev-libs/boost x11-proto/compositeproto x11-proto/damageproto x11-proto/fixesproto x11-proto/renderproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qtopengl-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.11.9:4[aqua=]
-DESCRIPTION=Plasma: KDE desktop framework
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug gps json +kdepim nepomuk python qalculate python_targets_python2_7 +handbook aqua
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libdbusmenu-qt[qt4(+)] >=dev-qt/qtcore-4.8.4-r3:4 !kde-misc/ktouchpadenabler >=kde-base/kactivities-4.11.9:4[aqua=] >=kde-base/kdelibs-4.11.9:4[aqua=,nepomuk?] >=kde-base/kephal-4.11.9:4[aqua=] >=kde-base/ksysguard-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] >=kde-base/libplasmaclock-4.11.9:4[aqua=,kdepim?] >=kde-base/libplasmagenericshell-4.11.9:4[aqua=] >=kde-base/libtaskmanager-4.11.9:4[aqua=] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender gps? ( >=sci-geosciences/gpsd-2.37 ) json? ( dev-libs/qjson ) kdepim? ( >=kde-base/kdepimlibs-4.11.9:4[aqua=] ) nepomuk? ( dev-libs/soprano >=kde-base/nepomuk-core-4.11.9:4[aqua=] ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/PyQt4-4.4.0[X,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=kde-base/pykde4-4.11.9:4[aqua=,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) qalculate? ( sci-libs/libqalculate ) >=kde-base/plasma-runtime-4.11.9:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.11.9:4[aqua=,handbook] ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qtopengl-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.11.9:4[aqua=]
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0db9e91979572ad2095b5dd736dfd5e1
diff --git a/metadata/md5-cache/kde-base/powerdevil-4.11.9 b/metadata/md5-cache/kde-base/powerdevil-4.11.9
deleted file mode 100644
index c01170b3db25..000000000000
--- a/metadata/md5-cache/kde-base/powerdevil-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kactivities-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] !aqua? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=PowerDevil is an utility for KDE4 for Laptop Powermanagement
-EAPI=5
-HOMEPAGE=http://solid.kde.org
-IUSE=debug +pm-utils aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kactivities-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] !aqua? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) pm-utils? ( sys-power/pm-utils ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=64921c1e23cfc8086b8015e9b5b2c1d6
diff --git a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.11.9 b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.11.9
deleted file mode 100644
index 06cab5db1230..000000000000
--- a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=Helps integration of pure Qt applications with KDE Workspace
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=11afb1fde56457b083ed6cf6d6254c97
diff --git a/metadata/md5-cache/kde-base/qtruby-4.14.3 b/metadata/md5-cache/kde-base/qtruby-4.14.3
deleted file mode 100644
index a5b8960ee92e..000000000000
--- a/metadata/md5-cache/kde-base/qtruby-4.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/smokeqt-4.14.3:4[aqua=,declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) >=dev-qt/qtopengl-4.8.5:4 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-DESCRIPTION=Qt Ruby bindings
-EAPI=5
-HOMEPAGE=http://techbase.kde.org/Development/Languages/Ruby
-IUSE=debug phonon qscintilla qwt webkit declarative aqua elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/smokeqt-4.14.3:4[aqua=,declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?] declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) >=dev-qt/qtopengl-4.8.5:4 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/4.14.3/src/qtruby-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2015ec92cb5cd791421dbd4fb6ceba63
diff --git a/metadata/md5-cache/kde-base/qtruby-4.14.3-r1 b/metadata/md5-cache/kde-base/qtruby-4.14.3-r1
deleted file mode 100644
index 26e34c2a70bf..000000000000
--- a/metadata/md5-cache/kde-base/qtruby-4.14.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/smokeqt-4.14.3:4[aqua=,declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) >=dev-qt/qtopengl-4.8.5:4 ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-DESCRIPTION=Qt Ruby bindings
-EAPI=5
-HOMEPAGE=http://techbase.kde.org/Development/Languages/Ruby
-IUSE=debug phonon qscintilla qwt webkit declarative aqua elibc_FreeBSD ruby_targets_ruby20
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/smokeqt-4.14.3:4[aqua=,declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?] declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) >=dev-qt/qtopengl-4.8.5:4 ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby20 )
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/4.14.3/src/qtruby-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a49e7c787b3db7590af08982e81c3d1b
diff --git a/metadata/md5-cache/kde-base/smokeqt-4.14.3 b/metadata/md5-cache/kde-base/smokeqt-4.14.3
deleted file mode 100644
index 85ec05d44e35..000000000000
--- a/metadata/md5-cache/kde-base/smokeqt-4.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/smokegen-4.14.3:4[aqua=] dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qttest:4 phonon? ( media-libs/phonon[qt4] ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla:= ) qwt? ( x11-libs/qwt:5[svg] ) webkit? ( dev-qt/qtwebkit:4 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) qthelp? ( >=dev-qt/qthelp-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 )
-DESCRIPTION=Scripting Meta Object Kompiler Engine - Qt bindings
-EAPI=5
-HOMEPAGE=http://techbase.kde.org/Development/Languages/Smoke
-IUSE=debug +phonon qimageblitz qscintilla qwt webkit declarative qthelp opengl multimedia aqua
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/smokegen-4.14.3:4[aqua=] dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qttest:4 phonon? ( media-libs/phonon[qt4] ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla:= ) qwt? ( x11-libs/qwt:5[svg] ) webkit? ( dev-qt/qtwebkit:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) qthelp? ( >=dev-qt/qthelp-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 )
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/4.14.3/src/smokeqt-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9850b553c37974b8a5cfd3afcb74445e
diff --git a/metadata/md5-cache/kde-base/smokeqt-4.14.3-r1 b/metadata/md5-cache/kde-base/smokeqt-4.14.3-r1
index 78bff43f96c2..3a688d9a1b6f 100644
--- a/metadata/md5-cache/kde-base/smokeqt-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/smokeqt-4.14.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Scripting Meta Object Kompiler Engine - Qt bindings
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Smoke
 IUSE=debug +phonon qimageblitz qscintilla qwt webkit xmlpatterns declarative qthelp opengl multimedia aqua
-KEYWORDS=~amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/smokegen-4.14.3:4[aqua=] dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qttest:4 phonon? ( media-libs/phonon[qt4] ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla:= ) qwt? ( x11-libs/qwt:5[svg] ) webkit? ( dev-qt/qtwebkit:4 ) xmlpatterns? ( dev-qt/qtxmlpatterns:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) qthelp? ( >=dev-qt/qthelp-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/smokeqt-4.14.3.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ff44dd13772827c73529469b377fbade
+_md5_=6779717092c21b2aef9f28c1dab3465c
diff --git a/metadata/md5-cache/kde-base/solid-actions-kcm-4.11.9 b/metadata/md5-cache/kde-base/solid-actions-kcm-4.11.9
deleted file mode 100644
index a40d3e1d95f1..000000000000
--- a/metadata/md5-cache/kde-base/solid-actions-kcm-4.11.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11.9:4[aqua=]
-DESCRIPTION=KDE control module for Solid actions
-EAPI=5
-HOMEPAGE=http://solid.kde.org
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/solid-runtime-4.11.9:4[aqua=] !kde-base/solid:4 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9: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.11.9:4[aqua=]
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8f4d5d7710bfad3635332c4d05ba7918
diff --git a/metadata/md5-cache/kde-base/systemsettings-4.11.9 b/metadata/md5-cache/kde-base/systemsettings-4.11.9
deleted file mode 100644
index 16f36bca2e61..000000000000
--- a/metadata/md5-cache/kde-base/systemsettings-4.11.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-misc/strigi dev-libs/glib:2 >=kde-base/kwin-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( virtual/libusb:0 ) x11-proto/kbproto x11-proto/xextproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=dev-qt/qtopengl-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.11.9:4[aqua=]
-DESCRIPTION=System settings utility
-EAPI=5
-HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/System_Settings
-IUSE=debug gtk semantic-desktop +usb test opengl +handbook aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-misc/strigi dev-libs/glib:2 >=kde-base/kwin-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( virtual/libusb:0 ) sys-libs/timezone-data x11-apps/setxkbmap x11-misc/xkeyboard-config gtk? ( kde-misc/kde-gtk-config ) semantic-desktop? ( >=kde-base/nepomuk-4.11.9:4[aqua=] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.11.9:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-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.11.9:4[aqua=]
-RESTRICT=test
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=af911219be7d255911aca3fae072919f
diff --git a/metadata/md5-cache/kde-base/systemsettings-4.11.9-r1 b/metadata/md5-cache/kde-base/systemsettings-4.11.9-r1
deleted file mode 100644
index e1ebb358a104..000000000000
--- a/metadata/md5-cache/kde-base/systemsettings-4.11.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-misc/strigi dev-libs/glib:2 >=kde-base/kwin-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( virtual/libusb:0 ) x11-proto/kbproto x11-proto/xextproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=dev-qt/qtopengl-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.11.9:4[aqua=]
-DESCRIPTION=System settings utility
-EAPI=5
-HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/System_Settings
-IUSE=debug gtk nepomuk +usb test opengl +handbook aqua
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-misc/strigi dev-libs/glib:2 >=kde-base/kwin-4.11.9:4[aqua=] >=kde-base/libkworkspace-4.11.9:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( virtual/libusb:0 ) sys-libs/timezone-data x11-apps/setxkbmap x11-misc/xkeyboard-config gtk? ( kde-misc/kde-gtk-config ) nepomuk? ( >=kde-base/nepomuk-4.11.9:4[aqua=] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11.9:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.11.9:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-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.11.9:4[aqua=]
-RESTRICT=test
-SLOT=4/4.11
-SRC_URI=mirror://kde/stable/4.12.5/src/kde-workspace-4.11.9.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	kde4-meta	43baa369240a27d6bc794953b4b07f66	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=731f8c72b062b7779621048dc2b47f61
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.7.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.7.0
index 77eab56ec45b..4338fffc5d87 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.7.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.7.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.7 >=kde-frameworks/kcoreaddons-5.7 >=kde-frameworks/kcrash-5.7 >=kde-frameworks/kdbusaddons-5.7 >=kde-frameworks/ki18n-5.7 >=kde-frameworks/kwindowsystem-5.7 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-libs/extra-cmake-modules-1.7.0 doc? ( >=kde-frameworks/kapidox-5.7 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.3.0:5 ) >=dev-qt/qtcore-5.3.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.7 >=kde-frameworks/kcoreaddons-5.7 >=kde-frameworks/kcrash-5.7 >=kde-frameworks/kdbusaddons-5.7 >=kde-frameworks/ki18n-5.7 >=kde-frameworks/kwindowsystem-5.7[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-libs/extra-cmake-modules-1.7.0 doc? ( >=kde-frameworks/kapidox-5.7 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.3.0:5 ) >=dev-qt/qtcore-5.3.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Framework to handle global shortcuts
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=nls test doc debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.7 >=kde-frameworks/kcoreaddons-5.7 >=kde-frameworks/kcrash-5.7 >=kde-frameworks/kdbusaddons-5.7 >=kde-frameworks/ki18n-5.7 >=kde-frameworks/kwindowsystem-5.7 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.3.0:5
+RDEPEND=>=kde-frameworks/kconfig-5.7 >=kde-frameworks/kcoreaddons-5.7 >=kde-frameworks/kcrash-5.7 >=kde-frameworks/kdbusaddons-5.7 >=kde-frameworks/ki18n-5.7 >=kde-frameworks/kwindowsystem-5.7[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.3.0:5
 SLOT=5/5.7
 SRC_URI=mirror://kde/stable/frameworks/5.7/kglobalaccel-5.7.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	c6c46d3380fbe0f748d7de802b01238f	kde5-functions	387824d97cb3ded6a9727b25d2f3c948	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=eb9b37a6b19aebba6dad4bdecbaa8b95
+_md5_=2dfe634e6623d4e86022c24ec06a4e15
diff --git a/metadata/md5-cache/kde-misc/tellico-2.3.10 b/metadata/md5-cache/kde-misc/tellico-2.3.10
new file mode 100644
index 000000000000..76745f6f421e
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/tellico-2.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson dev-qt/qtdbus:4 media-libs/qimageblitz addressbook? ( >=kde-base/kdepimlibs-4.13.1:4[aqua=] ) cddb? ( >=kde-base/libkcddb-4.13.1:4[aqua=] ) nepomuk? ( >=kde-base/kdelibs-4.13.1:4[aqua=,nepomuk?] ) pdf? ( app-text/poppler[qt4] ) scanner? ( >=kde-base/libksane-4.13.1:4[aqua=] ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2 ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.1:4[aqua=]
+DESCRIPTION=A collection manager for the KDE environment
+EAPI=5
+HOMEPAGE=http://tellico-project.org/
+IUSE=addressbook cddb debug nepomuk pdf scanner taglib v4l xmp yaz linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_kk linguas_lt linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson dev-qt/qtdbus:4 media-libs/qimageblitz addressbook? ( >=kde-base/kdepimlibs-4.13.1:4[aqua=] ) cddb? ( >=kde-base/libkcddb-4.13.1:4[aqua=] ) nepomuk? ( >=kde-base/kdelibs-4.13.1:4[aqua=,nepomuk?] ) pdf? ( app-text/poppler[qt4] ) scanner? ( >=kde-base/libksane-4.13.1:4[aqua=] ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2 ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.13.1:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_et(+)] ) ) linguas_eu? ( || ( kde-apps/kde-l10n[linguas_eu(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_eu(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_gl(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_hu(+)] ) ) linguas_ia? ( || ( kde-apps/kde-l10n[linguas_ia(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ia(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ja(+)] ) ) linguas_kk? ( || ( kde-apps/kde-l10n[linguas_kk(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_kk(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_lt(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_mr(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_nl(+)] ) ) linguas_nn? ( || ( kde-apps/kde-l10n[linguas_nn(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_nn(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sk(+)] ) ) linguas_sl? ( || ( kde-apps/kde-l10n[linguas_sl(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sl(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sv(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.13.1:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.1:4[aqua=]
+RESTRICT=test
+SLOT=4
+SRC_URI=http://tellico-project.org/files/tellico-2.3.10.tar.bz2
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=f0247ee814a6985e60bd3e1a6f8109be
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 d5ce5504cc0f..0f08b9575d16 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
@@ -4,10 +4,10 @@ DESCRIPTION=LXDE session manager (lite version)
 EAPI=5
 HOMEPAGE=http://lxde.sf.net/
 IUSE=nls upower
-KEYWORDS=~alpha ~amd64 arm ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ppc ~x86 ~arm-linux ~x86-linux
 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 sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb
-_md5_=e2a9c5e3c4e43d2d365ccbe2b1460989
+_md5_=7d1b62d9de774c53fce83f4a02c7f969
diff --git a/metadata/md5-cache/media-gfx/comix-4.0.4-r1 b/metadata/md5-cache/media-gfx/comix-4.0.4-r1
index 63cc6dd0a10a..d44b6b02f847 100644
--- a/metadata/md5-cache/media-gfx/comix-4.0.4-r1
+++ b/metadata/md5-cache/media-gfx/comix-4.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK image viewer specifically designed to handle comic books
 EAPI=5
 HOMEPAGE=http://comix.sourceforge.net
 IUSE=rar linguas_ca linguas_cs linguas_es linguas_fr linguas_hr linguas_hu linguas_id linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_sv linguas_zh_CN linguas_zh_TW python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] rar? ( || ( app-arch/unrar app-arch/rar ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/comix/comix-4.0.4.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2cc86538d55478707adb57d1cb2e3046
+_md5_=600cde7cd1f083920ee3db3bde614ad6
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2 b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
index 34b9698fb0cf..3b1810c96561 100644
--- a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=KDE program to view images
 EAPI=5
 HOMEPAGE=http://userbase.kde.org/KuickShow
 IUSE=debug +handbook linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_lv linguas_mai linguas_mk linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_uk linguas_uz linguas_uz@cyrillic linguas_vi linguas_xh linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/imlib !media-gfx/kuickshow:0 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_af? ( || ( kde-apps/kde-l10n[linguas_af(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_af(+)] ) ) linguas_ar? ( || ( kde-apps/kde-l10n[linguas_ar(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) ) linguas_be? ( || ( kde-apps/kde-l10n[linguas_be(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bn? ( || ( kde-apps/kde-l10n[linguas_bn(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bn(+)] ) ) linguas_br? ( || ( kde-apps/kde-l10n[linguas_br(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_cy? ( || ( kde-apps/kde-l10n[linguas_cy(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_eu? ( || ( kde-apps/kde-l10n[linguas_eu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) ) linguas_fa? ( || ( kde-apps/kde-l10n[linguas_fa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_he? ( || ( kde-apps/kde-l10n[linguas_he(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) ) linguas_hi? ( || ( kde-apps/kde-l10n[linguas_hi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) ) linguas_hne? ( || ( kde-apps/kde-l10n[linguas_hne(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) ) linguas_hr? ( || ( kde-apps/kde-l10n[linguas_hr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_is? ( || ( kde-apps/kde-l10n[linguas_is(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_km? ( || ( kde-apps/kde-l10n[linguas_km(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_lv? ( || ( kde-apps/kde-l10n[linguas_lv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) ) linguas_mai? ( || ( kde-apps/kde-l10n[linguas_mai(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) ) linguas_mk? ( || ( kde-apps/kde-l10n[linguas_mk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mk(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_ne? ( || ( kde-apps/kde-l10n[linguas_ne(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ne(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_nn? ( || ( kde-apps/kde-l10n[linguas_nn(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) ) linguas_oc? ( || ( kde-apps/kde-l10n[linguas_oc(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) ) linguas_pa? ( || ( kde-apps/kde-l10n[linguas_pa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_se? ( || ( kde-apps/kde-l10n[linguas_se(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sl? ( || ( kde-apps/kde-l10n[linguas_sl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_ta? ( || ( kde-apps/kde-l10n[linguas_ta(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) ) linguas_tg? ( || ( kde-apps/kde-l10n[linguas_tg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tg(+)] ) ) linguas_th? ( || ( kde-apps/kde-l10n[linguas_th(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_uz? ( || ( kde-apps/kde-l10n[linguas_uz(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uz(+)] ) ) linguas_uz@cyrillic? ( || ( kde-apps/kde-l10n[linguas_uz@cyrillic(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uz@cyrillic(+)] ) ) linguas_vi? ( || ( kde-apps/kde-l10n[linguas_vi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_vi(+)] ) ) linguas_xh? ( || ( kde-apps/kde-l10n[linguas_xh(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_xh(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kuickshow-0.9.1-kde4.4.0.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f54784213e6b457456909936bdc4845b
+_md5_=df15f8c313a05853c67c7206fc986180
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.2 b/metadata/md5-cache/media-libs/libepoxy-1.2
index 50558ed35035..3fcd73c2f512 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.2
+++ b/metadata/md5-cache/media-libs/libepoxy-1.2
@@ -4,9 +4,9 @@ DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management f
 EAPI=5
 HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/v1.2.tar.gz -> libepoxy-1.2.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1a7e8f430e4462bd2918c3e27cb1e9d7
+_md5_=d27f43509ded8968a7b54bd418b26e6b
diff --git a/metadata/md5-cache/media-libs/mesa-10.3.7-r1 b/metadata/md5-cache/media-libs/mesa-10.3.7-r1
index 0a73a2c9bc85..c71b78971993 100644
--- a/metadata/md5-cache/media-libs/mesa-10.3.7-r1
+++ b/metadata/md5-cache/media-libs/mesa-10.3.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux +udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~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 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT SGI-B-2.0
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.7 udev? ( kernel_linux? ( >=virtual/libudev-215:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.3-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-admin/eselect-opencl dev-libs/libclc ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.56[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] )
 REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium llvm video_cards_r600? ( r600-llvm-compiler ) video_cards_radeon? ( r600-llvm-compiler ) video_cards_radeonsi? ( r600-llvm-compiler ) ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.3.7/MesaLib-10.3.7.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=92e2ad60c51def0aa6fd38cdd4a297fe
+_md5_=cd8931fa8e921064dc985029eaa5933f
diff --git a/metadata/md5-cache/media-libs/sge-030809 b/metadata/md5-cache/media-libs/sge-030809
index 4dd4971b58bf..182604f33fe5 100644
--- a/metadata/md5-cache/media-libs/sge-030809
+++ b/metadata/md5-cache/media-libs/sge-030809
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install prepare
 DEPEND=media-libs/libsdl image? ( media-libs/sdl-image ) truetype? ( >=media-libs/freetype-2 )
 DESCRIPTION=Graphics extensions library for SDL
+EAPI=5
 HOMEPAGE=http://www.etek.chalmers.se/~e8cal1/sge/
 IUSE=doc examples image truetype
 KEYWORDS=amd64 ~ia64 ppc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=media-libs/libsdl image? ( media-libs/sdl-image ) truetype? ( >=media-libs/freetype-2 )
 SLOT=0
 SRC_URI=http://www.etek.chalmers.se/~e8cal1/sge/files/sge030809.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cc3223d3d592d1a651c1022a38a6c83e
+_md5_=118d3d14cfdfa058aff4154b6b436ccb
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8-r2 b/metadata/md5-cache/media-sound/xmms2-0.8-r2
index 0b8178c54069..ce6a3e24ce90 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8-r2
+++ b/metadata/md5-cache/media-sound/xmms2-0.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=X(cross)platform Music Multiplexing System. The new generation of th
 EAPI=3
 HOMEPAGE=http://xmms2.org/wiki/Main_Page
 IUSE=aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test +vorbis vocoder wavpack xml
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba[smbclient] ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( dev-lang/python ) ruby? ( >=dev-lang/ruby-1.8.5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmms2/xmms2-0.8DrO_o.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ffc417097cfe5981a29c644191c58f5a
+_md5_=ebaec0fcc32c5fd26f014820cedae19c
diff --git a/metadata/md5-cache/media-video/ffdiaporama-2.1 b/metadata/md5-cache/media-video/ffdiaporama-2.1
index 9873f73fa6e0..172eff0a14b7 100644
--- a/metadata/md5-cache/media-video/ffdiaporama-2.1
+++ b/metadata/md5-cache/media-video/ffdiaporama-2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Movie creator from photos and video clips
 EAPI=5
 HOMEPAGE=http://ffdiaporama.tuxfamily.org
 IUSE=libav openclipart texturemate
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 openclipart? ( CC0-1.0 ) texturemate? ( CC-BY-3.0 )
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 media-gfx/exiv2 media-libs/libsdl[sound] media-libs/taglib !libav? ( >media-video/ffmpeg-1.2:0=[encode] ) libav? ( >=media-video/libav-9:0=[encode] )
 SLOT=0
 SRC_URI=http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_bin_2.1.2014.0209.tar.gz -> ffdiaporama_bin_2.1.2014.0209.tar.gz http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_rsc_2.1.2014.0209.tar.gz -> ffdiaporama_rsc_2.1.2014.0209.tar.gz openclipart? ( http://openclipart.org/downloads/0.18/openclipart-0.18-svgonly.tar.bz2 ) texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=ffdiaporama_texturemate_1.0.2014.0125.tar.gz -> ffdiaporama_texturemate_1.0.2014.0125.tar.gz )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8f29a7f4f0e10ae9054bb1d3ffc5b484
+_md5_=d9cf7923155e714c4fd5a9354c33f355
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.2 b/metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.2
index 279309e27523..8ff3cb695fa1 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.2
+++ b/metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=IPMI Sensor Monitoring Plugin for Nagios/Icinga
 EAPI=5
 HOMEPAGE=http://www.thomas-krenn.com/en/oss/ipmi-plugin/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/IPC-Run sys-libs/freeipmi
 SLOT=0
 SRC_URI=http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=8120430;sf=tgz -> check_ipmi_sensor_v3-8120430.tgz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=be28c494f6d0eaaf7b6534988e88f63b
+_md5_=2f4d34208176183f157875f9aacf1f8f
diff --git a/metadata/md5-cache/net-fs/samba-4.1.14 b/metadata/md5-cache/net-fs/samba-4.1.14
deleted file mode 100644
index 92f935c49e26..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.1.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/popt sys-libs/readline virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/talloc-2.0.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) virtual/pkgconfig dev-lang/python !dev-lang/python[-threads] virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=5
-HOMEPAGE=http://www.samba.org/
-IUSE=acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap quota selinux syslog systemd test winbind python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/popt sys-libs/readline virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/talloc-2.0.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
-REQUIRED_USE=ads? ( acl ldap ) python_targets_python2_7
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.1.14.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=0a9796f49837d7c293c55a1ec302a79c
diff --git a/metadata/md5-cache/net-fs/samba-4.1.16 b/metadata/md5-cache/net-fs/samba-4.1.16
new file mode 100644
index 000000000000..270965c0078a
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.1.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/talloc-2.0.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) virtual/pkgconfig dev-lang/python !dev-lang/python[-threads] virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=5
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap quota selinux syslog systemd test winbind python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/talloc-2.0.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
+REQUIRED_USE=ads? ( acl ldap ) python_targets_python2_7
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.1.16.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
+_md5_=640a483a99719f495f96d1e3d2213b39
diff --git a/metadata/md5-cache/net-libs/czmq-2.2.0-r2 b/metadata/md5-cache/net-libs/czmq-2.2.0-r2
index 8e8896151ecd..c1b939a031bc 100644
--- a/metadata/md5-cache/net-libs/czmq-2.2.0-r2
+++ b/metadata/md5-cache/net-libs/czmq-2.2.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=High-level C Binding for ZeroMQ
 EAPI=5
 HOMEPAGE=http://czmq.zeromq.org
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm hppa ~x86
+KEYWORDS=amd64 ~arm hppa ~x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/libsodium:= sys-apps/util-linux >=net-libs/zeromq-2.1
 SLOT=0
 SRC_URI=http://download.zeromq.org/czmq-2.2.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=590399a32cd66109515234b815248746
+_md5_=5c6c4ac580aafff034e09b14e6e0d203
diff --git a/metadata/md5-cache/net-libs/libircclient-1.7 b/metadata/md5-cache/net-libs/libircclient-1.7
deleted file mode 100644
index 0a642bd7af46..000000000000
--- a/metadata/md5-cache/net-libs/libircclient-1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( dev-libs/openssl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Small but powerful library implementing the client-server IRC protocol
-EAPI=5
-HOMEPAGE=http://www.ulduzsoft.com/libircclient/
-IUSE=doc ipv6 ssl static-libs threads
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/libircclient/libircclient-1.7.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d9cc3618490916c2ab1dd658c3afddc7
diff --git a/metadata/md5-cache/net-libs/libkgapi-2.0.2 b/metadata/md5-cache/net-libs/libkgapi-2.0.2
deleted file mode 100644
index 53509819f7ab..000000000000
--- a/metadata/md5-cache/net-libs/libkgapi-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kdepimlibs-4.11:4[aqua=] dev-libs/qjson >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.11:4[aqua=]
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=5
-HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libkgapi
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kdepimlibs-4.11:4[aqua=] dev-libs/qjson || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.11: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.11:4[aqua=]
-SLOT=4
-SRC_URI=mirror://kde/stable/libkgapi/2.0.2/src/libkgapi-2.0.2.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b9200361e323c2b5dca3b28bb5787788
diff --git a/metadata/md5-cache/net-mail/swaks-20130209.0-r1 b/metadata/md5-cache/net-mail/swaks-20130209.0-r1
index 3f93fbbe8422..0b835b24faf6 100644
--- a/metadata/md5-cache/net-mail/swaks-20130209.0-r1
+++ b/metadata/md5-cache/net-mail/swaks-20130209.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Swiss Army Knife SMTP; Command line SMTP testing, including TLS and
 EAPI=5
 HOMEPAGE=http://www.jetmore.org/john/code/swaks
 IUSE=ssl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.8 >=dev-perl/Net-DNS-0.65 ssl? ( >=dev-perl/Net-SSLeay-1.35 ) >=virtual/perl-MIME-Base64-3.07 >=virtual/perl-Digest-MD5-2.39 >=virtual/perl-Time-HiRes-1.97 >=virtual/perl-Time-Local-1.19 >=dev-perl/Authen-NTLM-1.02 >=dev-perl/Authen-DigestMD5-0.04 virtual/perl-Digest-SHA
 SLOT=0
 SRC_URI=http://www.jetmore.org/john/code/swaks/swaks-20130209.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a1f8c61e949ceb1907816179c48b18b0
+_md5_=a52802fc9ec41ffca62f7a6b8edc006e
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.1 b/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.1
deleted file mode 100644
index df49445f9fbf..000000000000
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-misc/python-x2go-0.5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=X2Go command line client
-EAPI=5
-HOMEPAGE=http://www.x2go.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-misc/python-x2go-0.5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.5.0.1.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7e6fa26779a29256bcb723991e014984
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.2 b/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.2-r1
similarity index 97%
rename from metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.2
rename to metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.2-r1
index f2c0456d6ac6..2ed8ca8459b2 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.2
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.5.0.2.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0d9f2d9a417a674a863a6c01bb9988e1
+_md5_=d8685bf1268406988ab75ae0f293e8ee
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.3 b/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.3
deleted file mode 100644
index 74cc790da4ae..000000000000
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-distutils-extra[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=X2Go graphical client applet
-EAPI=5
-HOMEPAGE=http://www.x2go.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-misc/python-x2go-0.5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.5.0.3.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e1b80a59a61960d418db2ab04bb54154
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.4 b/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.4-r1
similarity index 97%
rename from metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.4
rename to metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.4-r1
index 63c8fffa36da..e290ac65ed01 100644
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.4
+++ b/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.5.0.4.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=59323e98fc3fb5282b3375a8b3bdac6a
+_md5_=cd5f1ea8c671e64ed1b5970dda375d1e
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
index 2eaf52fe5927..86ef30c2c8a3 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Remote desktop viewer display system
 EAPI=4
 HOMEPAGE=http://www.tigervnc.org
 IUSE=gnutls java nptl +opengl pam server +xorgmodule elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-admin/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.16* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.1-patches-0.1.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.3.1-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.16.0.tar.bz2 )
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b10e220120ff1bb2a45a2bee322db063
+_md5_=0ed6b40a09fbeca83395c2b534c164fb
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1
index b8387dd2f4b9..34c5fe693827 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=A fully functional ldap browser written in java
 EAPI=5
 HOMEPAGE=http://jxplorer.org/
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javahelp-2.0.02_p46:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1-project.zip
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bd2164fd0f64897c832e0ad74216ae81
+_md5_=2a67486a336cc21aecc2bf41560db432
diff --git a/metadata/md5-cache/net-p2p/nicotine+-1.2.16 b/metadata/md5-cache/net-p2p/nicotine+-1.2.16
index 4dc5c07142d1..7d4c294ebdae 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-1.2.16
+++ b/metadata/md5-cache/net-p2p/nicotine+-1.2.16
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=>=dev-python/pygtk-2.12 =dev-lang/python-2*
+DEPEND=>=dev-python/pygtk-2.12 gnome-base/librsvg =dev-lang/python-2*
 DESCRIPTION=A fork of nicotine, a Soulseek client in Python
 EAPI=3
 HOMEPAGE=http://nicotine-plus.sourceforge.net
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-python/pygtk-2.12 =dev-lang/python-2*
+RDEPEND=>=dev-python/pygtk-2.12 gnome-base/librsvg =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/nicotine-plus/nicotine+-1.2.16.tar.bz2
 _eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=45d80f20c2bef9a57823ec9a015af386
+_md5_=ec34ad6c555bf424bba8cfb282d1c11c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.0.4 b/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
index 3d82dbcaa6a3..c84a86ccb441 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=5
 HOMEPAGE=http://www.gromacs.org/
 IUSE=X blas boost cuda +doc -double-precision +fftw lapack +make-symlinks mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.0.4
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-5.0.4.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-5.0.4.tar.gz )
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cmake-utils	0430c386d85cec959d72640afd63ea91	cuda	2ba75c44d72d2b0b1fe31e2e2dc42d0e	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a0b1e592b179e4dba66396e9dd01c037
+_md5_=fd45946f6f5eba15981865ab0b412a64
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index ac17e2505904..13406be82444 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -9,4 +9,4 @@ RDEPEND=X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d2ade3f6aefb7cf28c2fc77a89363a03
+_md5_=7a910429efc72f44854ea28206d058d4
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.4 b/metadata/md5-cache/sci-libs/fftw-3.3.4
index 5d220e9ffda6..4cd547993a35 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.4
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=5
 HOMEPAGE=http://www.fftw.org/
 IUSE=altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) fortran? ( virtual/fortran )
 SLOT=3.0/3
 SRC_URI=http://www.fftw.org/fftw-3.3.4.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=784e48013d7a76933f3f56aa58c59c79
+_md5_=d2c915c901485e0ab40c04e5caa6eff0
diff --git a/metadata/md5-cache/sci-libs/scipy-0.12.1 b/metadata/md5-cache/sci-libs/scipy-0.12.1
deleted file mode 100644
index 9d104a8b588f..000000000000
--- a/metadata/md5-cache/sci-libs/scipy-0.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sci-libs/arpack virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack ) dev-lang/swig dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) virtual/fortran 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=Scientific algorithms library for Python
-EAPI=5
-HOMEPAGE=http://www.scipy.org/
-IUSE=doc sparse test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD LGPL-2
-RDEPEND=dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sci-libs/arpack virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack ) virtual/python-imaging[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] virtual/fortran 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://sourceforge/scipy/scipy-0.12.1.tar.gz doc? ( http://docs.scipy.org/doc/scipy/scipy-html.zip -> scipy-0.12.1-html.zip http://docs.scipy.org/doc/scipy/scipy-ref.pdf -> scipy-0.12.1-ref.pdf )
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=180e19528237ddc57d9482978e9f63c1
diff --git a/metadata/md5-cache/sci-libs/scipy-0.13.2 b/metadata/md5-cache/sci-libs/scipy-0.13.2
deleted file mode 100644
index afe5a13b33c9..000000000000
--- a/metadata/md5-cache/sci-libs/scipy-0.13.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sci-libs/arpack virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack ) dev-lang/swig >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) virtual/fortran 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=Scientific algorithms library for Python
-EAPI=5
-HOMEPAGE=http://www.scipy.org/
-IUSE=doc sparse test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD LGPL-2
-RDEPEND=dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sci-libs/arpack virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack ) virtual/python-imaging[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] virtual/fortran 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://sourceforge/scipy/scipy-0.13.2.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.13.0/scipy-html.zip -> scipy-0.13.0-html.zip http://docs.scipy.org/doc/scipy-0.13.0/scipy-ref.pdf -> scipy-0.13.0-ref.pdf )
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9b7e1038ac8e75c3d4a925054c098490
diff --git a/metadata/md5-cache/sci-libs/scipy-0.13.3 b/metadata/md5-cache/sci-libs/scipy-0.13.3
deleted file mode 100644
index 10fb380ef6cf..000000000000
--- a/metadata/md5-cache/sci-libs/scipy-0.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sci-libs/arpack virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack ) dev-lang/swig >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) virtual/fortran 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=Scientific algorithms library for Python
-EAPI=5
-HOMEPAGE=http://www.scipy.org/
-IUSE=doc sparse test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD LGPL-2
-RDEPEND=dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sci-libs/arpack virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack ) virtual/python-imaging[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] virtual/fortran 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://sourceforge/scipy/scipy-0.13.3.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.13.0/scipy-html.zip -> scipy-0.13.0-html.zip http://docs.scipy.org/doc/scipy-0.13.0/scipy-ref.pdf -> scipy-0.13.0-ref.pdf )
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=52ef5e02d8800992646389c7f11cf801
diff --git a/metadata/md5-cache/sci-libs/scipy-0.14.0 b/metadata/md5-cache/sci-libs/scipy-0.15.0
similarity index 96%
rename from metadata/md5-cache/sci-libs/scipy-0.14.0
rename to metadata/md5-cache/sci-libs/scipy-0.15.0
index 55860e1b6932..1a5c8eaca27d 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.14.0
+++ b/metadata/md5-cache/sci-libs/scipy-0.15.0
@@ -9,6 +9,6 @@ LICENSE=BSD LGPL-2
 RDEPEND=dev-python/numpy[lapack,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(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) 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(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-SRC_URI=mirror://sourceforge/scipy/scipy-0.14.0.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.13.0/scipy-html.zip -> scipy-0.13.0-html.zip http://docs.scipy.org/doc/scipy-0.13.0/scipy-ref.pdf -> scipy-0.13.0-ref.pdf )
+SRC_URI=mirror://sourceforge/scipy/scipy-0.15.0.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.13.0/scipy-html.zip -> scipy-0.13.0-html.zip http://docs.scipy.org/doc/scipy-0.13.0/scipy-ref.pdf -> scipy-0.13.0-ref.pdf )
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dc528ba449a6ebb3450f8806f57b460d
+_md5_=651b8a1068f6f43995631ff7bf58d9e7
diff --git a/metadata/md5-cache/sci-physics/lammps-20141030 b/metadata/md5-cache/sci-physics/lammps-20141030
index a57ce66b2948..2fc3acee6d7a 100644
--- a/metadata/md5-cache/sci-physics/lammps-20141030
+++ b/metadata/md5-cache/sci-physics/lammps-20141030
@@ -4,10 +4,10 @@ DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
 EAPI=5
 HOMEPAGE=http://lammps.sandia.gov/
 IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
 SLOT=0
 SRC_URI=http://lammps.sandia.gov/tars/lammps-30Oct14.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e29ed264dd9f333ffb01e82dab2ba949
+_md5_=d02b732e248415b2a10dd01b9eaec94e
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.1 b/metadata/md5-cache/sys-apps/epoch-1.2.1
index 93743b300fb3..50b657fb9b50 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.1
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst prepare pretend setup
 DESCRIPTION=An init system, a /sbin/init replacement; designed for simplicity
 EAPI=5
 HOMEPAGE=http://universe2.us/epoch.html
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/Subsentient/epoch/archive/1.2.1.tar.gz -> epoch-1.2.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8b96af1e18428b14d16a3f9ff51e7123
+_md5_=723202d67510efd9fcaf744147cb3548
diff --git a/metadata/md5-cache/sys-apps/install-xattr-0.4 b/metadata/md5-cache/sys-apps/install-xattr-0.4
index 78cce314299e..8630878ed218 100644
--- a/metadata/md5-cache/sys-apps/install-xattr-0.4
+++ b/metadata/md5-cache/sys-apps/install-xattr-0.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=Wrapper to coreutil's install to preserve Filesystem Extended Attributes
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~blueness/install-xattr/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/install-xattr/install-xattr-0.4.tar.bz2
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5cba4c7aa00210164b88dbca5dc9f4e0
+_md5_=e76874607e9cbd53801bf11c3dae6959
diff --git a/metadata/md5-cache/sys-apps/openrc-0.13.10 b/metadata/md5-cache/sys-apps/openrc-0.13.10
new file mode 100644
index 000000000000..33ca9d38155d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.13.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) tools? ( dev-lang/perl ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-libs/libselinux ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/base/openrc/
+IUSE=debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs tools unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) tools? ( dev-lang/perl ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-libs/libselinux ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( sec-policy/selinux-base-policy sec-policy/selinux-openrc )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~williamh/dist/openrc-0.13.10.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=423a77ed693a710b31805eac0311fc98
diff --git a/metadata/md5-cache/sys-apps/systemd-219 b/metadata/md5-cache/sys-apps/systemd-219
new file mode 100644
index 000000000000..787b284ce7ef
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-219
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
+DEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) terminal? ( media-fonts/unifont ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 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/dbus-1.6.8-r1:0[systemd] >=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/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1: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-auth/nss-myhostname !<sys-libs/glibc-2.14 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+SLOT=0/2
+SRC_URI=http://www.freedesktop.org/software/systemd/systemd-219.tar.xz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d69ae34f3204d6831572bc5c0e7c6903
diff --git a/metadata/md5-cache/sys-auth/bioapi-1.2.4 b/metadata/md5-cache/sys-auth/bioapi-1.2.4
index d55c4622d0ed..96b6ed8c2304 100644
--- a/metadata/md5-cache/sys-auth/bioapi-1.2.4
+++ b/metadata/md5-cache/sys-auth/bioapi-1.2.4
@@ -3,9 +3,9 @@ DESCRIPTION=Framework for biometric-based authentication
 EAPI=4
 HOMEPAGE=http://code.google.com/p/bioapi-linux/
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=bioapi
 SLOT=0
 SRC_URI=http://bioapi-linux.googlecode.com/files/bioapi_1.2.4.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=25b49846c1846252304404d54a478967
+_md5_=18d9a4f3766d907709bd4a5971b1ebc6
diff --git a/metadata/md5-cache/sys-devel/dragonegg-3.5.0 b/metadata/md5-cache/sys-devel/dragonegg-3.5.0
deleted file mode 100644
index 4cc3312a9262..000000000000
--- a/metadata/md5-cache/sys-devel/dragonegg-3.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst test
-DEPEND=>=sys-devel/gcc-4.5 =sys-devel/llvm-3.5.0*
-DESCRIPTION=GCC plugin that uses LLVM for optimization and code generation
-EAPI=5
-HOMEPAGE=http://dragonegg.llvm.org/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/gcc-4.5 =sys-devel/llvm-3.5.0*
-SLOT=0
-SRC_URI=http://llvm.org/releases/3.5.0/dragonegg-3.5.0.src.tar.xz test? ( http://llvm.org/releases/3.5.0/llvm-3.5.0.src.tar.xz )
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0a012b29304073c34fa97c7233a2c621
diff --git a/metadata/md5-cache/sys-devel/dragonegg-3.5.1 b/metadata/md5-cache/sys-devel/dragonegg-3.5.1
index 52f6745fcf2b..0160c9ec21a5 100644
--- a/metadata/md5-cache/sys-devel/dragonegg-3.5.1
+++ b/metadata/md5-cache/sys-devel/dragonegg-3.5.1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install postinst test
-DEPEND=>=sys-devel/gcc-4.5 =sys-devel/llvm-3.5.1*
+DEFINED_PHASES=compile install postinst pretend test
+DEPEND=>=sys-devel/gcc-4.5:* =sys-devel/llvm-3.5.1*
 DESCRIPTION=GCC plugin that uses LLVM for optimization and code generation
 EAPI=5
 HOMEPAGE=http://dragonegg.llvm.org/
 IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=>=sys-devel/gcc-4.5 =sys-devel/llvm-3.5.1*
+RDEPEND=>=sys-devel/gcc-4.5:* =sys-devel/llvm-3.5.1*
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.5.1/dragonegg-3.5.1.src.tar.xz test? ( http://llvm.org/releases/3.5.1/llvm-3.5.1.src.tar.xz )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=fdeaa5e119f00e269d730f8eafc38d07
+_md5_=784ff0268df750f393ccd1069f0690da
diff --git a/metadata/md5-cache/sys-devel/dragonegg-9999 b/metadata/md5-cache/sys-devel/dragonegg-9999
index 04c4d3045a48..8d75a1432371 100644
--- a/metadata/md5-cache/sys-devel/dragonegg-9999
+++ b/metadata/md5-cache/sys-devel/dragonegg-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=sys-devel/gcc-4.5 ~sys-devel/llvm-9999 >=dev-vcs/git-1.8.2.1
+DEPEND=>=sys-devel/gcc-4.5:* ~sys-devel/llvm-9999 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=GCC plugin that uses LLVM for optimization and code generation
 EAPI=5
 HOMEPAGE=http://dragonegg.llvm.org/
 LICENSE=GPL-2
-RDEPEND=>=sys-devel/gcc-4.5 ~sys-devel/llvm-9999
+RDEPEND=>=sys-devel/gcc-4.5:* ~sys-devel/llvm-9999
 SLOT=0
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	git-r3	3a2bd0ae504c33a50061885480f3def3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=75cc329d35c5fa31b6d690bfa74df71a
+_md5_=02870bf6b956d9d976e9c9362248a450
diff --git a/metadata/md5-cache/sys-libs/mtdev-1.1.5 b/metadata/md5-cache/sys-libs/mtdev-1.1.5
index 67e0172b3aa1..d0b9f448d9f9 100644
--- a/metadata/md5-cache/sys-libs/mtdev-1.1.5
+++ b/metadata/md5-cache/sys-libs/mtdev-1.1.5
@@ -4,8 +4,8 @@ DESCRIPTION=Multitouch Protocol Translation Library
 EAPI=5
 HOMEPAGE=http://bitmath.org/code/mtdev/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://bitmath.org/code/mtdev/mtdev-1.1.5.tar.bz2
-_md5_=d532f7148a3750ab701fdb7cb529ff15
+_md5_=7f6bba1478c110d152d4c3611d491e2e
diff --git a/metadata/md5-cache/www-client/chromium-42.0.2305.3 b/metadata/md5-cache/www-client/chromium-42.0.2305.3
index f8723c4cc35f..5a6e0bb8b480 100644
--- a/metadata/md5-cache/www-client/chromium-42.0.2305.3
+++ b/metadata/md5-cache/www-client/chromium-42.0.2305.3
@@ -11,4 +11,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-42.0.2305.3.tar.xz
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b5c54b02cb73085f2e8182db00c775d3
+_md5_=26966b7b77c6bfd2e9289daeb70677cc
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-41.0.2272.53_p1 b/metadata/md5-cache/www-client/google-chrome-beta-41.0.2272.63_p1
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-beta-41.0.2272.53_p1
rename to metadata/md5-cache/www-client/google-chrome-beta-41.0.2272.63_p1
index fe901a3fdbb5..f7680c4152a1 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-41.0.2272.53_p1
+++ b/metadata/md5-cache/www-client/google-chrome-beta-41.0.2272.63_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_41.0.2272.53-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_41.0.2272.53-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_41.0.2272.63-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_41.0.2272.63-1_i386.deb )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ca614b17cfddf224cff53863455866ee
+_md5_=477adeb99e1105341c8aa3b7c83da301
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-42.0.2298.0_p1 b/metadata/md5-cache/www-client/google-chrome-unstable-42.0.2305.3_p1
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-unstable-42.0.2298.0_p1
rename to metadata/md5-cache/www-client/google-chrome-unstable-42.0.2305.3_p1
index 20ad5191c135..b6bfebc2d3b3 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-42.0.2298.0_p1
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-42.0.2305.3_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_42.0.2298.0-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_42.0.2298.0-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_42.0.2305.3-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_42.0.2305.3-1_i386.deb )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8bafafc7b0a7308330e8257d9a0d84be
+_md5_=b2415bf57ca67d468575c7fc31ce867f
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-41.0.2272.53_beta1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-41.0.2272.63_beta1
similarity index 79%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-41.0.2272.53_beta1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-41.0.2272.63_beta1
index 58b73ce48e6c..62bb18ae01dd 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-41.0.2272.53_beta1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-41.0.2272.63_beta1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_41.0.2272.53-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_41.0.2272.53-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_41.0.2272.63-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_41.0.2272.63-1_i386.deb )
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=f9f167d6e8a6ca1203261227158f8fa4
+_md5_=d95f2b8887fa9eb405ffcf33740320ce
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-42.0.2298.0_alpha1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-42.0.2305.3_alpha1
similarity index 80%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-42.0.2298.0_alpha1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-42.0.2305.3_alpha1
index 5cd5a39ffcdc..9269fa524aa1 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-42.0.2298.0_alpha1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-42.0.2305.3_alpha1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_42.0.2298.0-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_42.0.2298.0-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_42.0.2305.3-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_42.0.2305.3-1_i386.deb )
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=de38ea02bcb7517beaa23b3ee92d03d7
+_md5_=5c82540244a9d3b92737d33916fe0383
diff --git a/metadata/md5-cache/www-servers/varnish-4.0.3 b/metadata/md5-cache/www-servers/varnish-4.0.3
new file mode 100644
index 000000000000..77539f469754
--- /dev/null
+++ b/metadata/md5-cache/www-servers/varnish-4.0.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=|| ( dev-libs/libedit sys-libs/readline ) dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses dev-python/docutils virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
+EAPI=5
+HOMEPAGE=http://www.varnish-cache.org/
+IUSE=jemalloc jit static-libs python_targets_python2_7 python_targets_python3_3 python_targets_pypy
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=BSD-2 GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] || ( dev-libs/libedit sys-libs/readline ) dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://repo.varnish-cache.org/source/varnish-4.0.3.tar.gz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=90ca1d5a2abcb4fbc3f17633817e6667
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.0.5 b/metadata/md5-cache/x11-apps/bdftopcf-1.0.5
index 9b638233dbb9..66af27e4cb6b 100644
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.0.5
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXfont !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automa
 DESCRIPTION=X.Org bdftopcf application
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 ~s390 ~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=MIT
 RDEPEND=x11-libs/libXfont
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.5.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=039fd9b8625daeab9988fcf6532e14e5
+_md5_=ee826162f0f87a0afdfd8c54e0e641e2
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.8 b/metadata/md5-cache/x11-apps/bitmap-1.0.8
index d17048e03413..3d0b95969454 100644
--- a/metadata/md5-cache/x11-apps/bitmap-1.0.8
+++ b/metadata/md5-cache/x11-apps/bitmap-1.0.8
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/x
 DESCRIPTION=X.Org bitmap application
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.8.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=bd7b2806e443776950ca23282e7a1cef
+_md5_=400deb3cbcfbefd9ea445320ad28dc4e
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.5 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.5
index 57d1890c3a34..8d39aebd54a9 100644
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.5
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-proto/xproto x11-libs/libFS !<sys-devel/gettext-0.18.1.1-r3 || ( >=sy
 DESCRIPTION=list fonts served by X font server
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-proto/xproto x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.5.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=b6f34669fbc70b63a3451999fbdf7d4b
+_md5_=6389cfd021c1f323ff7c9ca0944e9bb1
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.6 b/metadata/md5-cache/x11-apps/fstobdf-1.0.6
index 0411651ae74f..d4059e25a432 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.6
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.6
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libFS !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys
 DESCRIPTION=generate BDF font from X font server
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.6.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=3f6fc0a975d804fbd04d89803b77d5d0
+_md5_=3d815e93f22edfb8c5ab4ed797c7192e
diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.7 b/metadata/md5-cache/x11-apps/iceauth-1.0.7
index ba5f349e1890..394d0b7c72af 100644
--- a/metadata/md5-cache/x11-apps/iceauth-1.0.7
+++ b/metadata/md5-cache/x11-apps/iceauth-1.0.7
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libICE x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=s
 DESCRIPTION=ICE authority file utility
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libICE
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.7.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=739a6e134dde10a5d9b555394c6716d5
+_md5_=3560054cb00342089668e1b906367807
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.7 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.7
index 5241d559a262..8948b5ea6ff9 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.7
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.47[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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
+DEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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
 DESCRIPTION=Intel GPU userland tools
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=python video_cards_nouveau python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.47[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] )
+RDEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.7.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=94769b9c31f932ea3e8b7e602019214c
+_md5_=8ef67c3c1c8c1360200346fece9db338
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.2.0 b/metadata/md5-cache/x11-apps/mesa-progs-8.2.0
index fd672b523108..07ac330ad128 100644
--- a/metadata/md5-cache/x11-apps/mesa-progs-8.2.0
+++ b/metadata/md5-cache/x11-apps/mesa-progs-8.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=egl gles1 gles2
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut media-libs/glew media-libs/mesa[egl?,gles1?,gles2?] virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/demos/8.2.0/mesa-demos-8.2.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f215648821d4669d73c49bc01c09dd59
+_md5_=b006c80ac6c6f4a9f5e8a857975dfb70
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.1.2 b/metadata/md5-cache/x11-apps/mkfontscale-1.1.2
index e3271810daa7..15f55056c8c2 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.1.2
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.1.2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip
 DESCRIPTION=create an index of scalable font files for X
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.1.2.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=06532e46707a779cb2ba8d738663976a
+_md5_=a8be86831147c69ec347b107ca35dbad
diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.6 b/metadata/md5-cache/x11-apps/rgb-1.0.6
index d72a98c57a4d..717847e2a1fc 100644
--- a/metadata/md5-cache/x11-apps/rgb-1.0.6
+++ b/metadata/md5-cache/x11-apps/rgb-1.0.6
@@ -3,9 +3,9 @@ DEPEND=x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automak
 DESCRIPTION=uncompile an rgb color-name database
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.6.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=8d8fdf73e9ac79dcd0aef3059db8c024
+_md5_=6025a536ac5683f53bbf61ab8a744553
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.1.0 b/metadata/md5-cache/x11-apps/sessreg-1.1.0
index 260beb6a984b..93d37c1cab6f 100644
--- a/metadata/md5-cache/x11-apps/sessreg-1.1.0
+++ b/metadata/md5-cache/x11-apps/sessreg-1.1.0
@@ -3,9 +3,9 @@ DEPEND=x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automak
 DESCRIPTION=manage utmp/wtmp entries for non-init clients
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/sessreg-1.1.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=54ce58a9f5bc29bd8e3f835d2bec6040
+_md5_=5f7d98dd12bc76ba7b405e21cb642918
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.9-r1 b/metadata/md5-cache/x11-apps/xauth-1.0.9-r1
index c94d3333d44b..3ee0d7ad42ea 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.9-r1
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=X authority file utility
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.9.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=d9b98ff6f68f850765ba0c3e3df5f9f9
+_md5_=e0d150735451e815262b5680ef72f412
diff --git a/metadata/md5-cache/x11-apps/xcalc-1.0.6 b/metadata/md5-cache/x11-apps/xcalc-1.0.6
index 0488a0b0ad41..5be792cf0393 100644
--- a/metadata/md5-cache/x11-apps/xcalc-1.0.6
+++ b/metadata/md5-cache/x11-apps/xcalc-1.0.6
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11 !<sys-devel/gettext-0.18.1
 DESCRIPTION=scientific calculator for X
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.6.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=37728dee59da88c81c29db2bc28960c6
+_md5_=406b84b0f85f1b82cba1511399499b36
diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.6 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.6
index 2b7abba351b8..52278b308f31 100644
--- a/metadata/md5-cache/x11-apps/xcursorgen-1.0.6
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.6
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0 !<sys-devel/gette
 DESCRIPTION=create an X cursor file from a collection of PNG images
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.6.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=9cc0ca3980cf49e1b95b1b832bf65350
+_md5_=e1fcbf22aa0acb7b392ef74c77472349
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.3-r1 b/metadata/md5-cache/x11-apps/xinit-1.3.3-r1
index 771beef2826b..4755e52e8370 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.3-r1
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=X Window System initializer
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=+minimal
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=MIT GPL-2
 PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.3.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=231d07c6ba72cab7a38df860ea86a12b
+_md5_=d11186a2f774164c39e92d104380f2c5
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.3.0 b/metadata/md5-cache/x11-apps/xkbcomp-1.3.0
index 4c257b40b6ad..829a8740b4b4 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.3.0
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.3.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison !<sys-devel/gettext-0
 DESCRIPTION=compile XKB keyboard description
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.3.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=f845b47e3df68cfdb1d0c2a508a10554
+_md5_=552f8aa67214edba29abbeead207b44a
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.4.3 b/metadata/md5-cache/x11-apps/xrandr-1.4.3
index bd0a6f2c3935..1143d468574f 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.4.3
+++ b/metadata/md5-cache/x11-apps/xrandr-1.4.3
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libXrandr-1.4 x11-libs/libXrender x11-libs/libX11 !<sys-devel/
 DESCRIPTION=primitive command line interface to RandR extension
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.4 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrandr-1.4.3.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=52047f434e8745181ce17bf03c3fb6ec
+_md5_=838eb829eb7bae964fb300b0a92cbd17
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.16 b/metadata/md5-cache/x11-base/xorg-drivers-1.16
index a43d04f105bd..358d59033d20 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.16
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.16
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package containing deps on all xorg drivers
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
 IUSE=video_cards_apm video_cards_ast video_cards_chips video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_omap video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_v4l video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=metapackage
 PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_chips? ( x11-drivers/xf86-video-chips ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( x11-drivers/xf86-video-freedreno ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_rendition? ( x11-drivers/xf86-video-rendition ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_tseng? ( x11-drivers/xf86-video-tseng ) video_cards_v4l? ( x11-drivers/xf86-video-v4l ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-ark-0.7.5 !<=x11-drivers/xf86-video-newport-0.2.4 !<=x11-drivers/xf86-video-sis-0.10.7
 SLOT=0
-_md5_=fd4b73d0c6df57b05cac5d1722fbceb8
+_md5_=468fb66790f0ec7f61308e70a86225bf
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r4 b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r4
index bb3f8f868e0a..eba57e9da7f9 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r4
+++ b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r4
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 )
 RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.12.4
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2 mirror://gentoo/xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=2ae9fda93a73e210f60a415dc78a07dc
+_md5_=20715f890d0c8a4205897535602b648e
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.15.2-r2 b/metadata/md5-cache/x11-base/xorg-server-1.15.2-r2
index 37b14aac46c2..217f1dc70601 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.15.2-r2
+++ b/metadata/md5-cache/x11-base/xorg-server-1.15.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux +suid tslib +udev unwind static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.15 )
 RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-9.2.0[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.15.2
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.15.2.tar.bz2 mirror://gentoo/xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=e900c93fd9877b36847074e9c8551e38
+_md5_=02e67da2011fbd0574181885bdb85984
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.16.4 b/metadata/md5-cache/x11-base/xorg-server-1.16.4
index d7433b1cf870..32407650c363 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.16.4
+++ b/metadata/md5-cache/x11-base/xorg-server-1.16.4
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xnest xorg xvfb glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.16 )
 RDEPEND=>=app-admin/eselect-opengl-1.0.8 !>=app-admin/eselect-opengl-1.3.0 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.3 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy media-libs/mesa[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-9.2.0[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy ) >=x11-apps/xinit-1.3 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.16.1
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.16.4.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=8f73e2755e8703400e0cb2df4ac48047
+_md5_=124c876054ce7743fb096787b6228552
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3 b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
index 6bbc10ec6e0e..da9db6983f6b 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and new
 EAPI=5
 HOMEPAGE=http://www.amd.com
 IUSE=debug +modules qt4 static-libs pax_kernel abi_x86_32 abi_x86_64 kernel_linux
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=AMD GPL-2 QPL-1.0
 RDEPEND=<=x11-base/xorg-server-1.16.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu !x11-libs/xvba-video abi_x86_32? ( || ( virtual/glu[abi_x86_32] app-emulation/emul-linux-x86-opengl ) || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
@@ -12,4 +12,4 @@ RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	linux-info	2b8c53f6065bdee2d757472215a3088f	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c096344050198401e5f6bac6eef765fc
+_md5_=8bbe223191d88893219d805d718a1abb
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.9.1
index 1f10e7f42576..a44fc0eeaf47 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.9.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.12[udev] dev-libs/libevdev sys-libs/mtdev >=x11-
 DESCRIPTION=Generic Linux input driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.12[udev] dev-libs/libevdev sys-libs/mtdev x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.9.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=30508692659e0fb0336c979e37fb7ed1
+_md5_=bc1700d6fc2e77652e5cee40ddc7efc3
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.8.0 b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.8.0
index 90711ddd80b5..b68f70e76126 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.8.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.8.0
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.6.3 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-d
 DESCRIPTION=Keyboard input driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=e0db603abe34b201489b247a60cc45a6
+_md5_=ff1c316485d418cb64ee0776f1d66621
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.1
index 34d3148c659f..8c0466a2c8b0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.7 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-dev
 DESCRIPTION=X.Org driver for mouse input devices
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.7 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=8868af9dca3789702d08bd8b77f0c857
+_md5_=69a1e08e87e293bb4c548d7d610943ab
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.8.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.8.1
index bb95115aa269..e73b12b74bd5 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.8.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Driver for Synaptics touchpads
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
 IUSE=kernel_linux
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.12 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.8.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=eceb072f0f6045381f3007e940a143ec
+_md5_=44130f3f85e95b735075b9b56c5a8b3c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.0.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.0.0-r1
index 0733abe06ddc..56b57d1a0480 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.0.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=x11-proto/randrproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/aut
 DESCRIPTION=VMWare mouse input driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=473124088e9d08a547171dc81c36254e
+_md5_=63bdaee64fd9d5c955c711b50018a828
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.24.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.24.0
index 4f80e8ff54af..e156d89a6e12 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.24.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=Driver for Wacom tablets and drawing devices
 EAPI=5
 HOMEPAGE=http://linuxwacom.sourceforge.net/
 IUSE=debug
-KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/udev >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.24.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=225a5fa93ffd143646797c7d0495ec17
+_md5_=5390289128da2bd36fe192d0a60304c4
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ast-1.0.1 b/metadata/md5-cache/x11-drivers/xf86-video-ast-1.0.1
index ffde747b3193..be5a3b5d4d79 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ast-1.0.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ast-1.0.1
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys
 DESCRIPTION=X.Org driver for ASpeedTech cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-1.0.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=14fdd2b456252119765a2d064497612a
+_md5_=2f4f3005f2fe71b823dff776a96d67a1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.5.0
index 4e005de507c0..463d638d276c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=ATI video driver
 EAPI=5
 HOMEPAGE=http://www.x.org/wiki/ati/
 IUSE=+glamor udev
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.58[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( || ( x11-base/xorg-server[glamor] >=x11-libs/glamor-0.6 ) ) udev? ( virtual/udev ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-7.5.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=c25f0a061a13a454f0d4bd125b0de139
+_md5_=7840536c358f55a09fdfa062ffbed9b0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917
index e80664c06116..7bac57ecb112 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org driver for Intel cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug +sna +udev uxa xvmc dri
-KEYWORDS=amd64 ~x86 ~amd64-fbsd -x86-fbsd
+KEYWORDS=amd64 x86 ~amd64-fbsd -x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=3c8d30992a23220f082838325da6af77
+_md5_=040495874ddffe26ae964e396d715717
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.9.0 b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.9.0
index 42ebbf3fdde7..150fe1950436 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.9.0
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdrm-2.4.46 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel
 DESCRIPTION=Unaccelerated generic driver for kernel modesetting
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=c417a1f8a3c24d77110d8a8115c016b4
+_md5_=dc0c6dfd631f5ec88859713c7dae2ba6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.11 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.11
index a19fd4d8d399..8fe7c14b7e4e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.11
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.11
@@ -4,10 +4,10 @@ DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=5
 HOMEPAGE=http://nouveau.freedesktop.org/
 IUSE=glamor
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[glamor?] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=44ec3cd49e5c3f4a1dfeb6551ea78c98
+_md5_=b763600e4a6dd8a983d18b4d8253df7a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.3 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.3
index 2d0d52b5f452..62b980188db1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=QEMU QXL paravirt video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=xspice
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.1.3.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=a403be0244dad9f40af29ca98481172e
+_md5_=74d608bf64396ebb78b620bb9ec539a8
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5-r1
index 4c31d7f517e7..818ccf779003 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-
 DESCRIPTION=X.Org driver for s3 cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.5.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=04ef5fb56142b0d9506a0bed788f337a
+_md5_=e25510e750407a57df99998ef4e98a3e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.7-r1 b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.7-r1
index f5c406afd424..7662e3e55267 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.7-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.7-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-
 DESCRIPTION=Silicon Motion video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~mips x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=9d83c6fc06dcb86b9bb4a65fbf7b2d84
+_md5_=05373df3ee5649ae825f69f4517ad9ae
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.1.0
index 531046ef28e3..5e72e118c7b8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.1.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] !<sys-deve
 DESCRIPTION=VMware SVGA video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-13.1.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=603ca5b8d3f19486ef4763f65f88a2a9
+_md5_=570ca58e7fb33100560c083290b53803
diff --git a/metadata/md5-cache/x11-libs/glamor-0.6.0-r1 b/metadata/md5-cache/x11-libs/glamor-0.6.0-r1
index dbca3a18849a..2f9d9c338f4b 100644
--- a/metadata/md5-cache/x11-libs/glamor-0.6.0-r1
+++ b/metadata/md5-cache/x11-libs/glamor-0.6.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=OpenGL based 2D rendering acceleration library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=gles xv static-libs
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 >=media-libs/mesa-10[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/glamor-egl-0.6.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=81472eb0b1df92508c6298699da145a4
+_md5_=bb33836bf86e146af6e2b2b693a2f82b
diff --git a/metadata/md5-cache/x11-libs/libFS-1.0.6 b/metadata/md5-cache/x11-libs/libFS-1.0.6
index fb0edbd798be..1cb593f11d13 100644
--- a/metadata/md5-cache/x11-libs/libFS-1.0.6
+++ b/metadata/md5-cache/x11-libs/libFS-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org FS library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 static-libs
-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=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.6.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=5d60078bde268e530534b68547c4dc29
+_md5_=a64610b1149e1ec2e9f24b51145e6fc3
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.9 b/metadata/md5-cache/x11-libs/libICE-1.0.9
index 824e89df4d88..1f3b5782b12b 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.9
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Inter-Client Exchange library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~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/xtrans >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.9.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=e166101979870dcd9bb9b3fb000f88f2
+_md5_=f65bf2ccf70cae183874709be75d5b3c
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.3 b/metadata/md5-cache/x11-libs/libXext-1.3.3
index 5a87366faa88..57bdca60406d 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.3
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xext library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.3.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=cc77e30ad2eec6e326c484220dee1fb0
+_md5_=75746525c1ea2756034f34b62e2b30e8
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.5.0 b/metadata/md5-cache/x11-libs/libXfont-1.5.0
index 7be36320a296..a2bc24222da1 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.5.0
+++ b/metadata/md5-cache/x11-libs/libXfont-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfont library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=bzip2 ipv6 truetype static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto >=x11-proto/fontsproto-2.1.3 !<x11-base/xorg-server-1.5.99.901
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.5.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=50e41c24ce089b5d7fa08eccb35d736c
+_md5_=9c323812d2e6bfa543bede3f27cffdbd
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.2 b/metadata/md5-cache/x11-libs/libXft-2.3.2
index baef3e26f54b..b1f741168459 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.2
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xft library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/ttf-fonts abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.2.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=7f72b16cdb2e7fbfbeb6134a49bafbbd
+_md5_=abc2587c5e1dba0c89ddb361e0a8c18a
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.4 b/metadata/md5-cache/x11-libs/libXi-1.7.4
index 354117cad396..88175d7e5a01 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.7.4
+++ b/metadata/md5-cache/x11-libs/libXi-1.7.4
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xi library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/inputproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.4.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=1c317db09672bb1cbf61b9ced807590d
+_md5_=3b580f56332b975d4cf490446c13b1cf
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.59 b/metadata/md5-cache/x11-libs/libdrm-2.4.59
index 5d195f9f2e8b..7c3eacefe9d4 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.59
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.59
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=http://dri.freedesktop.org/
 IUSE=video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vmware libkms abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.59.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=8380e74ea9fecb895ed65ed49020537e
+_md5_=5a07ca6fdb99d4dc34346c2a6bf0443b
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13.3 b/metadata/md5-cache/x11-libs/libpciaccess-0.13.3
index 0d0285115cee..ce6d6d0d694a 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13.3
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13.3
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing generic access to the PCI bus and devices
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=minimal zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/hwids abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.3.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=a72ba977785072172ae9708aacdd944f
+_md5_=a2959a15a41360b7e28d7bcf99ce1a81
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r2 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r2
index 865f1977a3f9..dad75e23d6ef 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r2
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=VDPAU Backend for Video Acceleration (VA) API
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
 IUSE=debug opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libva-1.2.1-r1[X,opengl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libvdpau-0.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !x11-libs/vdpau-video
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva-vdpau-driver-0.7.4.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b95249c4174602ae6a4c200097f50164
+_md5_=cd2281ac1275fc3c73d98f4c5ffd49ae
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.11-r1 b/metadata/md5-cache/x11-libs/libxcb-1.11-r1
index e3cd84aa1a9d..7f99fd5aa78c 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.11-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings library
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=selinux xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~arm64 ~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=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0/1.11
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=ca136ff0da753e7d228c8d76daeff214
+_md5_=e212837a404287a5a17c8a73c655377d
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.5.0 b/metadata/md5-cache/x11-libs/libxkbcommon-0.5.0
index b6efc64d95f7..288dd062bba9 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.5.0
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org xkbcommon library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xkbcommon.org/download/libxkbcommon-0.5.0.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=44fb15afa6bb03003867c2d575792ca2
+_md5_=cf95d3c33e596347f5f0089f042c965f
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.2 b/metadata/md5-cache/x11-libs/libxshmfence-1.2
index 399bafd4f2f7..d58c33161673 100644
--- a/metadata/md5-cache/x11-libs/libxshmfence-1.2
+++ b/metadata/md5-cache/x11-libs/libxshmfence-1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Shared memory fences using futexes
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-1.2.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=56bd2cbd2240e786de5070ff23580860
+_md5_=3f3508fc4ed08ec6919c8b3454c0d6e8
diff --git a/metadata/md5-cache/x11-libs/pixman-0.32.6 b/metadata/md5-cache/x11-libs/pixman-0.32.6
index 17d4463ff288..c8fa52043eff 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.32.6
+++ b/metadata/md5-cache/x11-libs/pixman-0.32.6
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level pixel manipulation routines
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.32.6.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=a38a98db280500295cb7a6af77a4150f
+_md5_=bbe2b96d5f5c65803c0502ad87bd4e6b
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.4.0 b/metadata/md5-cache/x11-libs/xcb-util-0.4.0
index 787fa17c9e35..a33c1ce8b7a1 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.4.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 PDEPEND=>=x11-libs/xcb-util-cursor-0.1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-keysyms-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-renderutil-0.3.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-wm-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.4.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=1a521323cdf0528d3b479aeb0a452741
+_md5_=bc1f4756d3bccebf4db9896b5cf21e59
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
index 3cecaf9d3a09..84163e3c57ab 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xcb-proto-1.8-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-cursor-0.1.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=b955e184f6a3abd842e3f83822455958
+_md5_=f60c65ead37fa4ae44e376fdd94f41d4
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0 b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
index 11b651cbd78e..3c8e96f2de6f 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.4.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=3589d0e14383a2307794cb423ec05c4d
+_md5_=08d06d9d7a4bfabda2da1a4d22baff9f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
index ba2b018bacae..cfc020ea43f4 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.4.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=8afc09e8a5f64e881e0806913dbe12f7
+_md5_=c0f98360295144af007040a1d9466cd6
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
index c862cfcf53e6..efb53807b690 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.9.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=4051bc0c2228f06ffe579bb1b20d6707
+_md5_=9e7879da7bce80f83fc6ec67b6e0cfe2
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
index 76bd8396986a..d9f6f5d116f4 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.4.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=df6cc1fd3bc75f6a6cdfe147ba91d3b3
+_md5_=7afbd065b902f9bc648479ebb1260760
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.3.5 b/metadata/md5-cache/x11-libs/xtrans-1.3.5
index 667e6890482d..fb26e26ae1c9 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.3.5
+++ b/metadata/md5-cache/x11-libs/xtrans-1.3.5
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org xtrans library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~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
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.3.5.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=1950af8fb117a6da5bf6f4295d0aa35d
+_md5_=db7da3dd5a7d70d16e885d46767e7a13
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-1.0.3 b/metadata/md5-cache/x11-misc/gccmakedep-1.0.3
index ed45a66dddb2..b417a31d9f7f 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-1.0.3
+++ b/metadata/md5-cache/x11-misc/gccmakedep-1.0.3
@@ -4,9 +4,9 @@ DESCRIPTION=create dependencies in makefiles using 'gcc -M'
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-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-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.3.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=ab745bd29d9bced5ee96d705d7bcd22a
+_md5_=560cd5a823ffdc757f9c87514752c899
diff --git a/metadata/md5-cache/x11-misc/qcomicbook-0.9.0-r1 b/metadata/md5-cache/x11-misc/qcomicbook-0.9.0-r1
index 19e563783060..d8a44ddaf0e6 100644
--- a/metadata/md5-cache/x11-misc/qcomicbook-0.9.0-r1
+++ b/metadata/md5-cache/x11-misc/qcomicbook-0.9.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A viewer for comic book archives containing jpeg/png images
 EAPI=5
 HOMEPAGE=http://qcomicbook.org/
 IUSE=debug linguas_cs_CZ linguas_de_DE linguas_es_ES linguas_fi_FI linguas_fr_CA linguas_fr_FR linguas_it_IT linguas_ko_KR linguas_nl_NL linguas_pl_PL linguas_pt_BR linguas_ru_RU linguas_uk_UA linguas_zh_CN
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 app-text/poppler[qt4]
 SLOT=0
 SRC_URI=http://qcomicbook.org/releases/qcomicbook-0.9.0.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b078123592c41d61c1bc3babb7c879d8
+_md5_=8635ee7c1b439924780f070d4a029cf8
diff --git a/metadata/md5-cache/x11-misc/read-edid-3.0.1 b/metadata/md5-cache/x11-misc/read-edid-3.0.1
index cb57138a54b9..482f70831b8a 100644
--- a/metadata/md5-cache/x11-misc/read-edid-3.0.1
+++ b/metadata/md5-cache/x11-misc/read-edid-3.0.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libx86-1.1 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU
 DESCRIPTION=Program that can get information from a PnP monitor
 EAPI=5
 HOMEPAGE=http://www.polypux.org/projects/read-edid/
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libx86-1.1
 SLOT=0
 SRC_URI=http://www.polypux.org/projects/read-edid/read-edid-3.0.1.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=854322e22a92e3ce6acd205cbbe0c15c
+_md5_=5f6b7ff26be74e47f904a887ab224a35
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.19.0 b/metadata/md5-cache/x11-misc/util-macros-1.19.0
index 0a4f60ab293a..be3bf7c2918a 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.19.0
+++ b/metadata/md5-cache/x11-misc/util-macros-1.19.0
@@ -3,9 +3,9 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys
 DESCRIPTION=X.Org autotools utility macros
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.19.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=742d68a88e9448ae51ec164fabf51f8b
+_md5_=d757a335b1c8eb084c6f5774d35feb72
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.14 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.14
index 2b0cdd987a97..2f557d8e6524 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.14
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.14
@@ -3,10 +3,10 @@ DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-
 DESCRIPTION=X keyboard configuration database
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.14.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=a5cb87a26cba2037ed7e630accfa8f8f
+_md5_=4c0967683d0274d20e61ab2f283f45e5
diff --git a/metadata/md5-cache/x11-misc/xtermcontrol-3.2 b/metadata/md5-cache/x11-misc/xtermcontrol-3.2
index 4278755eac61..0742871343b8 100644
--- a/metadata/md5-cache/x11-misc/xtermcontrol-3.2
+++ b/metadata/md5-cache/x11-misc/xtermcontrol-3.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=xtermcontrol enables dynamic control of XFree86 xterm properties
 EAPI=5
 HOMEPAGE=http://www.thrysoee.dk/xtermcontrol/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.thrysoee.dk/xtermcontrol/xtermcontrol-3.2.tar.gz
-_md5_=d9f16318a96035b4ebf17c574f224bfe
+_md5_=626d4ba840e62adb6e1c8c3ab218e22a
diff --git a/metadata/md5-cache/x11-plugins/bfm-0.6.4-r2 b/metadata/md5-cache/x11-plugins/bfm-0.6.4-r2
index 1e8f43cbf471..2da182870413 100644
--- a/metadata/md5-cache/x11-plugins/bfm-0.6.4-r2
+++ b/metadata/md5-cache/x11-plugins/bfm-0.6.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfi
 EAPI=5
 HOMEPAGE=http://www.jnrowe.ukfsn.org/projects/bfm.html
 IUSE=gkrellm
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.jnrowe.ukfsn.org/files/bfm-0.6.4.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f9c171a83a1cde1238bb239b70084654
+_md5_=e59e6f167244ecfb252e16f418a9ef38
diff --git a/metadata/md5-cache/x11-plugins/wmcoincoin-2.6.2_p20140602 b/metadata/md5-cache/x11-plugins/wmcoincoin-2.6.2_p20140602
index a6d6786d01e9..7c8af0d2b50a 100644
--- a/metadata/md5-cache/x11-plugins/wmcoincoin-2.6.2_p20140602
+++ b/metadata/md5-cache/x11-plugins/wmcoincoin-2.6.2_p20140602
@@ -4,10 +4,10 @@ DESCRIPTION=a dockapp for browsing dacode news and board sites
 EAPI=5
 HOMEPAGE=http://hules.free.fr/wmcoincoin
 IUSE=nls xinerama
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXext x11-libs/libXpm x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://github.com/d-torrance/wmcoincoin/archive/debian/2.6.2+20140602-1.tar.gz -> wmcoincoin-2.6.2_p20140602.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6ce2e267ea0c094a141f8448a2189014
+_md5_=d7fb6bf15158a387b3a67599d8ba02d8
diff --git a/metadata/md5-cache/x11-proto/fontsproto-2.1.3 b/metadata/md5-cache/x11-proto/fontsproto-2.1.3
index 5a9223f57cc1..a26a18014763 100644
--- a/metadata/md5-cache/x11-proto/fontsproto-2.1.3
+++ b/metadata/md5-cache/x11-proto/fontsproto-2.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org Fonts protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.3.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=e2a341190402b474a6c1aa21f9b7aea3
+_md5_=b1e7456f14c3811305942e3d09b63806
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.3.1 b/metadata/md5-cache/x11-proto/inputproto-2.3.1
index d7c1b2c2e4a4..b379f4bde37f 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.3.1
+++ b/metadata/md5-cache/x11-proto/inputproto-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Input protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.3.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=b084833b50e7caf65632ec164fbbe8c6
+_md5_=27b59697e0cadffbe270d58f94b587d4
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.11 b/metadata/md5-cache/x11-proto/xcb-proto-1.11
index 7558cc5f8490..89ba57d2d986 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.11
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.11
@@ -4,11 +4,11 @@ DESCRIPTION=X C-language Bindings protocol headers
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~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=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=629808c2c32baad68b271fdf6279549e
+_md5_=acc5b2a38319bf1672b483c9b29c5976
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.27 b/metadata/md5-cache/x11-proto/xproto-7.0.27
index 96991bb4120b..a0d71df84f3d 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.27
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.27
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org xproto protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~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
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.27.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=df93a26b306eedf4b6aad86a01693a60
+_md5_=147fe8e9b9ad30f67b91c0e623534339
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.21 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.21
index 53b7fc26de0e..420684fb150b 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.21
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.21
@@ -4,7 +4,7 @@ DESCRIPTION=rxvt clone with xft and unicode support
 EAPI=5
 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-3
 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.21.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a3036a7a79d0477242d8c1988ca50892
+_md5_=12be5d88f5a4dec322b9f4efe4137a2e
diff --git a/metadata/md5-cache/x11-terms/xterm-314 b/metadata/md5-cache/x11-terms/xterm-314
index 91c51cf78b9e..afcc8f855e35 100644
--- a/metadata/md5-cache/x11-terms/xterm-314
+++ b/metadata/md5-cache/x11-terms/xterm-314
@@ -4,10 +4,10 @@ DESCRIPTION=Terminal Emulator for X Windows
 EAPI=5
 HOMEPAGE=http://invisible-island.net/xterm/
 IUSE=+openpty toolbar truetype unicode Xaw3d
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7 x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=ftp://invisible-island.net/xterm/xterm-314.tgz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b3c601b7425d01728254cd62f35da20f
+_md5_=c22e2ee29c4d667948836ae62e0862ef
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 44d8ec7f86fc..1191d50f5c63 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Feb 2015 19:06:54 +0000
+Thu, 19 Feb 2015 13:06:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 87e24525cc4d..5f6aa1ccc4c7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Feb 18 19:06:51 UTC 2015
+Thu Feb 19 13:06:50 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4b2357323f63..73c07f6a7218 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Feb 2015 19:30:01 +0000
+Thu, 19 Feb 2015 13:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a4922500d4f5..5c0c8dc9c0aa 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1424286301 Wed 18 Feb 2015 07:05:01 PM UTC UTC
+1424351101 Thu 19 Feb 2015 01:05:01 PM UTC UTC
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
index 8cfef4236a9f..bc454990fbeb 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild,v 1.1 2014/01/25 14:09:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild,v 1.2 2015/02/19 09:08:04 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index bc12188b806f..240b5fff0b2c 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,3 +1,3 @@
-DIST ipt-netflow-2.1.tgz 635 SHA256 4c9af4437123ca1d65498a00b70a7a186972a21f14c8b3cc905b9f5d1705142c SHA512 d1bf6ce313d8d8cabfd9276a234a2b53b7c400044173e9319c0d235c87334a7ee1ae8895b47fdba684c018514f6da9d57dda9734330b9e50a8b63b017c06d49c WHIRLPOOL 8d635e1f0adfabecb2fbd11ca208a212c589037409dbbf6361a5225a76e5c345581a73b67fd58ff921825fce3a4bdf923c7e6aa0cf659602f9521198040352ed
+DIST ipt-netflow-2.1.tgz 87872 SHA256 1cc1ee518ecd6c7d8d792ea79c0f69d03ce450c10fefd37f053c43aac92e9931 SHA512 0055ebb1846077f94c1fbf701af8a07a432058c8e86e31c6f420d5c00c96b45012abdcdeef3c5b1ead7d20c7efd51ac65d000b6cb931d878f528f52de0ab9c21 WHIRLPOOL e46ffe69f58293cca0fc26c2ff13ee30e68e2a60a4b198c89fdb24ebc45a4376877285358d4e72019c811d70d0a77194dbc0d46f44c8076923fc626cfe2e7488
 DIST ipt_netflow-2.0.1.tgz 46567 SHA256 486faab3b96af2eb7702188a2c50de7a11c9fcc224b4ace8e5ad02cd4d62de2d SHA512 3717439c5135285bb55d65848a049d56beb64dfaf7b06b71352e93c33bf6a69ae3091581d1874e67b24e65c552719dc7d58d79d861fe6bf6e9de671050da7f7e WHIRLPOOL 84af501748f61db1d76d217424560f5ca1d6b8a5b280e2d6d30431e05773a5338def0679c1e3cf1973dac2bf624b7e2629a6f37cd3024cc05ad75a0eb6b55c61
 DIST ipt_netflow-2.0.1_p20150109.tar.bz2 69870 SHA256 d657fd17a45b965f83906eb760d4811c691e4ced4421a22e0e6e9f504133fa6b SHA512 e113f911e466b9e8cabdc5c852693b0fca5d197d2f82c5effa63bd5337964f361b7199c9a8a3f33dcf77180bfb752fecc18ef862277f2b03e9a6270847565032 WHIRLPOOL 7625cab156a48cfea6e0a0cebde6415b4601d2b0cd67543a350c0e05ab102e3b8ac684d73325f82c58ff7754ca59862e92ef648054b54ce72b1436ad3a3a4542
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 929b84a623de..9dbd28a1c52d 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,6 +3,6 @@ DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb
 DIST samba-3.6.24.tar.gz 34122116 SHA256 11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7 SHA512 40f054ab0e1ef07fa4bb4934229c42eb0e484596c4d4b81edbf43951acd56e7b04b6efb17e6cb269b329f1a84d60cbe10a3ff04e86c1983ec603bdcf7fc7ecbb WHIRLPOOL e98d3ae62e5d57e5d16b320213961ba7221b8b38912b90434296323549e1673f25682ec8da469dd771d68ec222a6be7d30e24224e0cde0d9dc1e9c393590c68a
 DIST samba-4.0.23.tar.gz 22140738 SHA256 47d7b9d0caf76ea111794c6181db2fed5c15fd496a5a9eaa8ed4323302c72118 SHA512 49a6889ce3124be0d12df75d30837dde63605d706a34e9017d6e8e365e97910d75bad3eef28296030fdbb013074b68e5e89ad73e3a73806b38e94d306104d711 WHIRLPOOL 99ba11be30df2ce3f9e8af144d435e6b152d657957241043082dc699b90a8352998f5f1b32e810ed8e8e4853fb39792d68a92d97a12d97e3edec65c54b611fab
 DIST samba-4.0.24.tar.gz 22148369 SHA256 e1e4068c65684848d8cb17c8997c91be426ff75ccd617f647878307817af615a SHA512 927f57e1bd5b1744ce4bfbcc023989130d176901bd854b88a6c0d761cd29b1ba8b15f0a71cc70bf663105b5e5afb47ce8935181f269d1e0d9444dd2f9f011616 WHIRLPOOL 8dfc8cf16b25660df6b889b96bcc0058abed52cfac0d2d990373ca70aaddd680b6e58cccbc0c68ffaa2eab413386e3ea3632fa807393b1452752da601bd8dbf4
-DIST samba-4.1.14.tar.gz 19527260 SHA256 5ea14baaca997292355d368918879e3d639def92b54efef2279cf5abe8db2cba SHA512 58a42baa442acab33699e143128f7f22738f2ef05184acef0fd004279954c919f7d7d0df299990c3beb13a950c64a76b257add15322074a1e6934b5a8563885f WHIRLPOOL 77c3f657e37e50aee97f3b766982124b4e9e937231ec814322fcb4fcacf5b824247e230adbecbedf4894be16b1f2c3606c3cb6851c41c7a8d673f63d1557aad5
 DIST samba-4.1.15.tar.gz 19530544 SHA256 9d84112124512428ddc9cc0d9975524bab730b9a598a9ff90458666afb3f42f4 SHA512 7ea71e0083aa487ce7942b11496aa3d6a2d9b47759e9b387f9703ae99aacf96d4350dbaa05a64a124c12fcc97a7b232387710667a19b1e03b6a7c7b5a360f011 WHIRLPOOL 5dd14a65e368cff52c7ece83f5751757901ca8c8aeb52f519d254d8e7bf6feef336abc37ab502ac90b1e12b2976c05077eefb0d1bb3a8ca7e4848a5f5030fb27
+DIST samba-4.1.16.tar.gz 19534236 SHA256 12a09c167bfa25f50b82775bcbeda94c71c5d71d3b0d1210f6dae0f23020a87b SHA512 78ed60432262eb468ba87fea1202603e13e996181015f42d6b45b40f4b181e64283365c36faf70be60cc6fddd28c88365c22dc286785815e1108a1239d34cf98 WHIRLPOOL d6eeab6a9d4d25ad5be2f8f3a01721bdb53bf87498a448a416de7c4f9663811a6ce332164362f9d9bf206bb1bd6d977b047d9829052420370bf285ce93e76630
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
diff --git a/net-fs/samba/samba-4.1.14.ebuild b/net-fs/samba/samba-4.1.16.ebuild
similarity index 96%
rename from net-fs/samba/samba-4.1.14.ebuild
rename to net-fs/samba/samba-4.1.16.ebuild
index 87c4f32ecde1..6461faa76fbb 100644
--- a/net-fs/samba/samba-4.1.14.ebuild
+++ b/net-fs/samba/samba-4.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild,v 1.4 2015/01/03 19:54:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.16.ebuild,v 1.1 2015/02/19 09:43:23 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -29,7 +29,7 @@ CDEPEND="${PYTHON_DEPS}
 	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
 	dev-libs/popt
-	sys-libs/readline
+	sys-libs/readline:=
 	virtual/libiconv
 	dev-python/subunit[${PYTHON_USEDEP}]
 	sys-apps/attr
@@ -68,7 +68,6 @@ S="${WORKDIR}/${MY_P}"
 
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
-# sys-apps/dmapi is an automagic dependency (see bug #474492)
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.14-named.conf.dlz.patch"
 	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
diff --git a/net-libs/czmq/czmq-2.2.0-r2.ebuild b/net-libs/czmq/czmq-2.2.0-r2.ebuild
index 904e4ac76721..b181d0b7d899 100644
--- a/net-libs/czmq/czmq-2.2.0-r2.ebuild
+++ b/net-libs/czmq/czmq-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.2.0-r2.ebuild,v 1.3 2015/02/15 07:10:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.2.0-r2.ebuild,v 1.4 2015/02/19 10:40:12 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~x86"
+KEYWORDS="amd64 ~arm hppa ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index 127619b734ec..3ed2f27435b9 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -1,3 +1,2 @@
 DIST libircclient-1.6.tar.gz 392788 SHA256 6c511923023398bcd7627cf3305054befacf6874203cb0de36bdbe658779e953 SHA512 94a68f27fcb12c918fa347d4ee44747e08e016245048c81f179b9a45081bd336c329e7185a3bc46deb28c9c77e1eff5dc53de7e723b1ed5ee2c1d3cc57ce0548 WHIRLPOOL f0958c14f923b97e38d230e3d9a27aa08ef9162c0749ef0defb7b107083b27f3458dc652944672cae76527258b788045dcc040d33f055df70a5cab8e16da9ca1
-DIST libircclient-1.7.tar.gz 291829 SHA256 2f0c6cfcbd90e527630bc0a1afdca63e10fddb50f021ca683f7bf07f96345ae1 SHA512 5bc0b400e706b2da7c5ce2bc480b32cad4edb5f11046af4b34ca39c86cea915f8ece7f1e75b83e61fe85cb25db1be0b519fac5ea0d3224bd29ada2b7324430b8 WHIRLPOOL 0952ef0befbe1198fa4dcb56915e3cf4d7a1272ba8d39c40779ca8460c331d3ab8a34236d5e2e6f5456ed293e773a5d95211a3a0ba6acf21bc3b1a18380312b8
 DIST libircclient-1.8.tar.gz 291803 SHA256 2cf8523ac683588f2785b08159a2df3e4d15939ee655c0024aa86334149de8f6 SHA512 f19e4b55cf49091ab2c83ff3d5cace2252daad6bf23cb61b7677b9c6055fe8a8a7d891f6e1e5962481c836f47b7dcd35ef563c8807737ac81e3c4cee253cfc4a WHIRLPOOL 39550aa403445ca333aeeca2108c6a5e67cbf2eb1f53d313aa4e970f39b702f3862698a0ce7956ad0c93034d9b0f59313b695a7666910872eb9505dd2e895e1b
diff --git a/net-libs/libircclient/files/libircclient-1.7-build.patch b/net-libs/libircclient/files/libircclient-1.7-build.patch
deleted file mode 100644
index 86ea64efd55a..000000000000
--- a/net-libs/libircclient/files/libircclient-1.7-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libircclient-1.7.orig/configure.in
-+++ libircclient-1.7/configure.in
-@@ -61,9 +61,7 @@
- AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")
- 
- if test "$use_debug" = "yes"; then
--	CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
--else
--	CFLAGS="${CFLAGS} -O3"
-+	CFLAGS="${CFLAGS} -DENABLE_DEBUG"
- fi
- 
- # Choosing the target
diff --git a/net-libs/libircclient/files/libircclient-1.7-include.patch b/net-libs/libircclient/files/libircclient-1.7-include.patch
deleted file mode 100644
index c5bce1dfd947..000000000000
--- a/net-libs/libircclient/files/libircclient-1.7-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libircclient-1.6.orig/include/libircclient.h
-+++ libircclient-1.6/include/libircclient.h
-@@ -130,6 +130,7 @@
- #define IN_INCLUDE_LIBIRC_H
- #include "libirc_errors.h"
- #include "libirc_events.h"
-+#include "libirc_rfcnumeric.h"
- #include "libirc_options.h"
- #undef IN_INCLUDE_LIBIRC_H
- 
diff --git a/net-libs/libircclient/files/libircclient-1.7-shared.patch b/net-libs/libircclient/files/libircclient-1.7-shared.patch
deleted file mode 100644
index 50b56648e025..000000000000
--- a/net-libs/libircclient/files/libircclient-1.7-shared.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- libircclient-1.7.orig/src/Makefile.in
-+++ libircclient-1.7/src/Makefile.in
-@@ -1,8 +1,10 @@
- # $Id: libircclient-1.7-shared.patch,v 1.1 2014/03/13 06:41:52 mr_bones_ Exp $
- CC = @CC@
--CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
-+CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
- AR=@AR@ cr
- RANLIB=@RANLIB@
-+INSTALL=install
-+LN=ln -sf
- INCLUDES=-I../include
- DESTDIR=
- APIVERSION = 1
-@@ -15,19 +17,24 @@
- shared: libircclient.so
- shared_mingw: libircclient.dll
- 
--install:
--	-mkdir -p $(DESTDIR)@prefix@/include
--	-mkdir -p $(DESTDIR)@libdir@
--	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
--	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
--	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
--	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
--	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
--	cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
--	ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
-+install: install-headers install-static install-shared
-+install-headers:
-+	$(INSTALL) -d $(DESTDIR)@prefix@/include
-+	$(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
-+	$(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
-+	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
-+	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
-+	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
-+install-shared:
-+	$(INSTALL) -d $(DESTDIR)@libdir@
-+	$(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
-+	$(LN) libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
-+install-static:
-+	$(INSTALL) -d $(DESTDIR)@libdir@
-+	$(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
- 
- libircclient.so: libircclient.o
--	$(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LIBS@
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
- 
- libircclient.dll: libircclient.o
- 	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.7-static.patch b/net-libs/libircclient/files/libircclient-1.7-static.patch
deleted file mode 100644
index b820a19c73d1..000000000000
--- a/net-libs/libircclient/files/libircclient-1.7-static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libircclient-1.7.orig/src/Makefile.in
-+++ libircclient-1.7/src/Makefile.in
-@@ -9,6 +9,9 @@
- DESTDIR=
- APIVERSION = 1
- 
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+
- OBJS = libircclient.o
- 
- all:	@TARGET@
diff --git a/net-libs/libircclient/libircclient-1.7.ebuild b/net-libs/libircclient/libircclient-1.7.ebuild
deleted file mode 100644
index 9b78c5a34d00..000000000000
--- a/net-libs/libircclient/libircclient-1.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/libircclient-1.7.ebuild,v 1.1 2014/03/13 06:41:52 mr_bones_ Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
-HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
-SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc ipv6 ssl static-libs threads"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${P}-static.patch \
-		"${FILESDIR}"/${P}-include.patch
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable ipv6) \
-		$(use_enable ssl openssl) \
-		$(use_enable ssl threads)
-}
-
-src_compile() {
-	emake -C src $(usex static-libs "shared static" "shared")
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install-shared $(usex static-libs "install-static" "")
-	insinto /usr/include/libircclient
-	doins include/*.h
-
-	dodoc Changelog THANKS
-	doman man/libircclient.1
-}
diff --git a/net-libs/libkgapi/Manifest b/net-libs/libkgapi/Manifest
index 18619d078a33..8883b808bdb7 100644
--- a/net-libs/libkgapi/Manifest
+++ b/net-libs/libkgapi/Manifest
@@ -1,2 +1 @@
-DIST libkgapi-2.0.2.tar.xz 112876 SHA256 cb3687fef43cf35f061c50be949272d5340e87facbd6f778ed218f87592f8bad SHA512 da3a496afd99f25000cf146c0ff034e2a8b0a14b7fbaf89a83ed61460aec97d5f64669031ee3697c54d465dcf2a528a0bc9fde6cbf130bb62d96f683df677bea WHIRLPOOL 368cc2d07fec7fd5b4154fdd81888dd37ee6044f961130b8f85d8b37e6965d5c10b3cbe0cad90687a4990297e64368e7ed6f60749c0522bc657c5be98776a814
 DIST libkgapi-2.2.0.tar.bz2 127026 SHA256 c02965b639c2496d489d4f1865e35473db6f1b5e9e84fb079988d33db629c2b4 SHA512 c5f37aacb89243d7985d7064aa8941d3d2a6c26685113e876b38c737ea2e1126b40b0f88b0908e7ea8a7bcb2fade1dc528c2f73f22890b9e892c6d18d9d3bb42 WHIRLPOOL 1aa1d5c661098793a6c6a112ed92198c044cd0ab9e320631e165dc2cbb510df6c7d0a96412b2147728aaba822e40c571c07ca2b88ad5f5a055c0755490774a08
diff --git a/net-libs/libkgapi/libkgapi-2.0.2.ebuild b/net-libs/libkgapi/libkgapi-2.0.2.ebuild
deleted file mode 100644
index f254a48c6eab..000000000000
--- a/net-libs/libkgapi/libkgapi-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkgapi/libkgapi-2.0.2.ebuild,v 1.5 2014/01/26 10:53:29 ago Exp $
-
-EAPI=5
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.11"
-inherit kde4-base
-
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="debug"
-SLOT=4
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	dev-libs/qjson
-"
-RDEPEND=${DEPEND}
-
-src_configure() {
-	mycmakeargs=(
-		-DKGAPI_DISABLE_DEPRECATED=TRUE
-		-DKCAL=OFF
-	)
-	kde4-base_src_configure
-}
diff --git a/net-mail/swaks/swaks-20130209.0-r1.ebuild b/net-mail/swaks/swaks-20130209.0-r1.ebuild
index 780f2d41dbbb..bb662f18944a 100644
--- a/net-mail/swaks/swaks-20130209.0-r1.ebuild
+++ b/net-mail/swaks/swaks-20130209.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/swaks/swaks-20130209.0-r1.ebuild,v 1.2 2014/07/29 16:00:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/swaks/swaks-20130209.0-r1.ebuild,v 1.3 2015/02/19 09:06:42 ago Exp $
 
 EAPI=5
 inherit eutils
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.jetmore.org/john/code/swaks"
 SRC_URI="http://www.jetmore.org/john/code/swaks/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 IUSE="ssl"
 
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
index 0890961e17d2..51cc8f787830 100644
--- a/net-misc/pyhoca-cli/Manifest
+++ b/net-misc/pyhoca-cli/Manifest
@@ -1,2 +1 @@
-DIST pyhoca-cli-0.5.0.1.tar.gz 31775 SHA256 439fa1a323b0b22e42d4f1242f923fde115a73c91e8b637934d581d32035a810 SHA512 8186afc5fd02904d608b2a3df7e218d1418b2c573a0f9440fcdec56c9e04b08b3bba9eb335a952873ae8eca5fe778e95dcbadb980020f720bb858fb0370c3a59 WHIRLPOOL fa0971f5377bb79b6fb38bdf1c070330467973eb7f17a6e3a3f3d2673a0e200a71486533ae84999dcbd2585c9dd6fc5b653496a8d6603fb73293e1c7162fd744
 DIST pyhoca-cli-0.5.0.2.tar.gz 32084 SHA256 8261fedff24553217eba269a3c57e30b9953b37f58b09038f487637d83203d5e SHA512 46569c786014629d07d4a92e9ca31a8cf8a13cab43ba518213bf212b4391d038d169da931f536f8a088d26978b46428acb6ef8d46c7bc3737afc7086263a3a01 WHIRLPOOL fbfcd99887574a09849a2959811e7c5403499aa94184bc0cc2e7f14a23bfa35d6bfc03afa746827f53cce632e4dc25002377e07bf30243a08be7511af45a1d17
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.1.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.1.ebuild
deleted file mode 100644
index 647b76dfba09..000000000000
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.1.ebuild,v 1.2 2014/11/27 14:26:41 voyageur Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="X2Go command line client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_doexe ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-}
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.2-r1.ebuild
similarity index 88%
rename from net-misc/pyhoca-cli/pyhoca-cli-0.5.0.2.ebuild
rename to net-misc/pyhoca-cli/pyhoca-cli-0.5.0.2-r1.ebuild
index 8f89e113a2f2..9c4b3b93303e 100644
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.2.ebuild
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.2.ebuild,v 1.1 2015/02/03 12:39:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.2-r1.ebuild,v 1.1 2015/02/19 09:36:37 voyageur Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}"
 
 python_install() {
 	distutils-r1_python_install
-	python_doexe ${PN}
+	python_doscript ${PN}
 }
 
 python_install_all() {
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
index ba769b056288..edd8bf29c6e8 100644
--- a/net-misc/pyhoca-gui/Manifest
+++ b/net-misc/pyhoca-gui/Manifest
@@ -1,2 +1 @@
-DIST pyhoca-gui-0.5.0.3.tar.gz 1300444 SHA256 dcaf1edb98411448f05be3a47465427bd49348a701528da96c82edaf7c539a70 SHA512 9af44eee09f50e8a221b38d134c8867ee12e513ad6a57aa9c1bc5f8188e09bb3a4599d6a73056c9bf1aae1194d2c482694884d54c9cd07954d5b1c94ac002a71 WHIRLPOOL 4e16a95b8c7d798a4bd2c97fcfdd4b40bcce841ec1ea32c95b8e70b8686c2ff5e69131bef68c13a6b82906813c26b2b3d83987ea0d9ca7eb8f2f79a0b2e7d26f
 DIST pyhoca-gui-0.5.0.4.tar.gz 1331234 SHA256 72fd2a7904cc8b74d8fef937b6923ac45d1071f48445e42b2f2df088648403b9 SHA512 a39db02604437ef64de63ef4f5ac70652e9d0b21f94dfd1916adc127fc691b4919af5146baeecabc5f4c821981c0a11f903c0ed41160ef50bc07cfb0706653d6 WHIRLPOOL 4416934c9b7379f140159757f60ed840de00b4bc9ff74c8be03568b09e4c31d4d746ff4186e4c323de8d2ae7b9ee59fc69ef77ac87f048822209a128b35cc688
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.3.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.3.ebuild
deleted file mode 100644
index b5157bd90f2d..000000000000
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.3.ebuild,v 1.1 2014/11/27 14:43:07 voyageur Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="X2Go graphical client applet"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pycups[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-
-python_install() {
-	distutils-r1_python_install
-	python_doexe ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-}
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.4.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.4-r1.ebuild
similarity index 91%
rename from net-misc/pyhoca-gui/pyhoca-gui-0.5.0.4.ebuild
rename to net-misc/pyhoca-gui/pyhoca-gui-0.5.0.4-r1.ebuild
index bd4fee0d41bf..c82bd953e301 100644
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.4.ebuild
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.4.ebuild,v 1.1 2015/02/03 12:39:39 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.4-r1.ebuild,v 1.1 2015/02/19 09:35:42 voyageur Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ DEPEND="${DEPEND}
 
 python_install() {
 	distutils-r1_python_install
-	python_doexe ${PN}
+	python_doscript ${PN}
 }
 
 python_install_all() {
diff --git a/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild b/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild
index f674727a73f2..6c896fcd4a82 100644
--- a/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild,v 1.2 2015/02/13 10:16:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild,v 1.3 2015/02/19 10:41:13 ago Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="gnutls java nptl +opengl pam server +xorgmodule"
 
 RDEPEND="virtual/jpeg:0
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
index c4ac3acaa4b7..968c8a0d0713 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.3.1.ebuild,v 1.2 2014/08/10 20:53:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.3.1.ebuild,v 1.3 2015/02/19 09:03:43 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ LICENSE="CAOSL"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=virtual/jre-1.5
 	>=dev-java/javahelp-2.0.02_p46:0"
diff --git a/net-p2p/nicotine+/nicotine+-1.2.16.ebuild b/net-p2p/nicotine+/nicotine+-1.2.16.ebuild
index 2942ad1de24f..20e30742091b 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.16.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.16.ebuild,v 1.7 2013/04/20 18:13:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.16.ebuild,v 1.8 2015/02/18 19:08:02 rhill Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-python/pygtk-2.12"
+RDEPEND=">=dev-python/pygtk-2.12
+	gnome-base/librsvg"
 
 DEPEND="${RDEPEND}"
 
diff --git a/profiles/package.mask b/profiles/package.mask
index a765e1dfe06d..fd828d661285 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16370 2015/02/18 13:15:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16373 2015/02/19 11:53:31 mrueg Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,23 @@
 
 #--- END OF EXAMPLES ---
 
+# Ian Delaney <idella4@gentoo.org> (19 Feb 2015)
+# Some no longer fetch and upstream dead. genetic was to be
+# used by sci-chemistry/pymss but this is absent from portage.
+# For g-pypi, maintainer has lost interest and abandonned the package.
+# Masked for removal in 30 days
+dev-python/cherryflow
+dev-python/colubrid
+dev-python/genetic
+dev-python/gnosis-utils
+dev-python/g-pypi
+dev-python/ldaptor
+
+# Michael Palimaka <kensington@gentoo.org> (19 Feb 2015)
+# Doesn't work with current version of ruby. Dead upstream.
+# Masked for removal in 30 days.
+games-board/kaya
+
 # Bernard Cafarelli <voyageur@gentoo.org> (18 Feb 2015)
 # Masked release candidates for testing
 =sys-devel/llvm-3.6.0_rc*
@@ -159,15 +176,6 @@ dev-perl/IP-Country
 # Removal in 30 days.
 virtual/ruby-rdoc
 
-# Manuel Rüger <mrueg@gentoo.org> (18 Jan 2015)
-# Ruby 1.9 only packages, do not build with later rubies
-# Removal in 30 days.
-dev-ruby/flickr
-dev-ruby/gemcutter
-dev-ruby/ruby_parser:0
-dev-ruby/drydock
-dev-ruby/net-dns
-
 # Manuel Rüger <mrueg@gentoo.org> (17 Jan 2015)
 # Unmaintained. Old eclasses, EAPIs and various bugs.
 # See bug #533642
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index fb3f696336dd..eb4243893972 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.28 2014/06/29 00:41:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.29 2015/02/19 02:58:02 tetromino Exp $
 
 # For eautoreconf in =app-crypt/seahorse-3.10.2-r1
 app-crypt/gcr vala
@@ -78,3 +78,8 @@ www-servers/apache apache2_modules_dav apache2_modules_dav_fs apache2_modules_au
 
 # Required by app-admin/sabayon
 x11-base/xorg-server kdrive
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
+# Set reasonable default toolkit for gnome users to prevent emerge error
+# when USE=tools
+x11-drivers/nvidia-drivers -gtk2 gtk3
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index b2047fe1013b..c64df0d32f8e 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.42 2015/02/18 05:17:33 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.43 2015/02/19 02:58:02 tetromino Exp $
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
+# Set reasonable default toolkit for all desktops to prevent emerge error
+# when USE=tools
+x11-drivers/nvidia-drivers gtk2
 
 # Ben de Groot <yngwin@gentoo.org> (18 Feb 2015)
 # Enable sensible defaults for desktop users (bug #540046)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6dd67db59ec1..8158de099a77 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3119,7 +3119,6 @@ kde-base/kopete:highlight - Allows you to specify highlights on specific events.
 kde-base/kopete:history - Enables saving chat history.
 kde-base/kopete:latex - Embed latex formatted text into messages.
 kde-base/kopete:meanwhile - Enable the Sametime protocol handler.
-kde-base/kopete:msn - Enable "Windows live messenger" protocol support.
 kde-base/kopete:nowlistening - Shows song you currently listen to in your status/etc. Bindings for many players.
 kde-base/kopete:otr - Allows crypting your chat (drugs and talking nonsense are considered as good alternatives ;]).
 kde-base/kopete:pipes - Send messages to external pipe.
diff --git a/sci-chemistry/gromacs/gromacs-5.0.4.ebuild b/sci-chemistry/gromacs/gromacs-5.0.4.ebuild
index a2ce83b05bb9..8a29ec52ae97 100644
--- a/sci-chemistry/gromacs/gromacs-5.0.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-5.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-5.0.4.ebuild,v 1.2 2015/01/31 20:23:56 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-5.0.4.ebuild,v 1.3 2015/02/19 09:03:13 ago Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ if [[ $PV = *9999* ]]; then
 else
 	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
 		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 06241140bf3a..834289988bc5 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.18 2014/10/30 21:20:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.19 2015/02/18 19:43:36 vapier Exp $
 
 EAPI="5"
 
@@ -71,7 +71,6 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
-	epatch "${FILESDIR}"/${PN}-3.11-hotplug-config.patch #511584
 
 	# Avoid useless -L paths to the install dir
 	sed -i \
@@ -109,7 +108,7 @@ src_configure() {
 		chrpath=False
 		gpsd_user=gpsd
 		gpsd_group=uucp
-		strip=False
+		nostrip=True
 		python=False
 		manbuild=False
 		shared=$(usex !static True False)
diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
index d7b0033c347f..9f99ca678f1b 100644
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ b/sci-libs/fftw/fftw-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.8 2015/02/17 21:05:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.9 2015/02/19 09:04:13 ago Exp $
 
 EAPI=5
 
@@ -14,11 +14,11 @@ HOMEPAGE="http://www.fftw.org/"
 if [[ ${PV} = *9999 ]]; then
 	inherit git-2
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-	KEYWORDS="arm hppa"
+	KEYWORDS="amd64 arm hppa"
 	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index cf68f81d2de6..9132a3827fa2 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,8 +1,4 @@
-DIST scipy-0.12.1-html.zip 15578583 SHA256 07c773c6056e5fc0cb65d7048995d0ff056f48f1e482d610865361870ee07998 SHA512 71308ff306ee5556822a279e8dd21efd6c9174fbb5c100acf9e34308cf828789cd257aac5a447a6dbfa8b464447753ea49d6e5819555fbf8db73b3e51fddc2cb WHIRLPOOL 124b12ace1a297789b4f544a28539da964bc756aae72572b2926c9df81b2bd492fdcc4b39bb8b9d83305d21834c7e225a576225a8a94a316707c517583fa9dca
-DIST scipy-0.12.1-ref.pdf 11193207 SHA256 4a8298fba9c6d62aeb392ee6588ac45cb266ed6cffb59573f6c19d7779bfc18b SHA512 cad60983c74a447a0e3ba898b81bdea3101dbad7603f1ca8030e3ff9f431eeb8c7b2dd207a45af616ef596e85c0c1846944057ecc11482fe9b389869ee49b137 WHIRLPOOL af600c6cb5c59306b2f5a84df421465a97cae9138f0cf024a0748c80bd516d8fe6a2db135fd56d66eab25f36c99acb3c0825d50b7d376e0ed3d9bd0c4c282943
-DIST scipy-0.12.1.tar.gz 9012911 SHA256 15122afe6cb377b010982f9bc46cf41b12af703fd34088aa3971a80276b00e76 SHA512 13dba0b2ff9b69a109403110aaaca892362935262e3999992de96b081eae036fe5dbb3ca209d84ade948377c6ccb4137777c36f76121f8745855dc1d08b86e97 WHIRLPOOL 71467b86b992b14b4bc6c354ac4b4ec138951ab0d17b28c07ac605a81852f4f55bdfe35553ffdecd9611ef0daf2c35012424e28db9c9ff8e2cf6eb3fe0d2583a
 DIST scipy-0.13.0-html.zip 18283054 SHA256 3010783ebdc18988440cd0047f061bbfcac98677782cd10e8b4f09e20bbbc23d SHA512 082cb1e0915f6095f80522a76fed4e106ed82889df613c1bcada9a4faded8917fd7e686448f585a5bee5478280ae21f6adf9bd4add125b9082f93eb93e61feef WHIRLPOOL 48b5e2ee9274f324969c413986110a87422b5f3667b617884dd01c660cdabeb05c5e17ca33e861b2fa2cc5caf89e1233aba9f2855386fe211255c5ceee437ac7
 DIST scipy-0.13.0-ref.pdf 14748179 SHA256 52caa5fd7e74f2e5a78f26296d2150808eee9e153ca3cee62d05892bbd1bac8c SHA512 9e2d40b154c73e9ad3405038e2c71e01650b9a05781355d499b09d647ae6a73d65d542c36b60a87ac530f9b7509bf1c023624952c2f4f2b2f9fb56394456ec91 WHIRLPOOL 5071c593b999db1a57057731e995153fead4155f04b69b770fd1b2203cc5eb13f6f9395a179c4a06e1d8fc5dfa559f51c494f52a27d524b2794d9683e487e273
-DIST scipy-0.13.2.tar.gz 10144409 SHA256 485f194c7fe46da92e63bff524346ccaed4040c27df536bbde7b1edc9a07b449 SHA512 ab9acb0a8b388eaf8528be4fd0bcbf954e9a6337a874d666bf1590d396018c5b818c08d0227b4655f45aa408d4e0f1c500588016a90c2dba0f03e2aa3f6a5c60 WHIRLPOOL 99258cc7e1438535849b85727afa5730be1a1b9f179515c1e1c297e825a56fae2ac385775a40156431c0031e08aa198387667fa92cb2f36fc5c49dadd9040013
-DIST scipy-0.13.3.tar.gz 10712509 SHA256 a9e33c7ee060c35cd5c6ee3ac9e5e9bbb99219d7ea8c89537c2e80e581670266 SHA512 8cf32c8ea4d8fe903bafae23dedb4d4ba80b580f5bddf351ea1d2bbbdcbd753389d7992f2db39d7a6b3f0629674daa697c2660d25396ef506f1e3b81c817170a WHIRLPOOL 5065bf05263d8633063705a2d55236e57e4d0861c105b50e7e5d8a1341e4840df37bbad16fc2d2c9f7d95880f875803b96d129f4e766b8bc5a13e926bc4e216d
 DIST scipy-0.14.0.tar.gz 10212944 SHA256 4b41a3e6bf178df1c7f0ef3bfeabf1f56610329aca5dbd7b6d64da8ac9af6b14 SHA512 ad1278740c1dc44c5e1b15335d61c4552b66c0439325ed6eeebc5872a1c0ba3fce1dd8509116b318d01e2d41da2ee49ec168da330a7fafd22511138b29f7235d WHIRLPOOL b15322cef988bbc910794f3b34ee8741edd227f223da4384b3a6471b7a37c1cb3efbacb3f6dde7b6e9929c93e683de5f5898a43d26fadaa2317c433cb3bbec72
+DIST scipy-0.15.0.tar.gz 11398495 SHA256 0c74e31e08acc8bf9b6ceb9bced73df2ae0cc76003e0366350bc7b26292bf8b1 SHA512 ca5a9af177d598ca4328a5de9d029858e8e10bc160f88f715bfe351a5747b6c86f9351b9f51a2d8e33f40fc93930c93e2baddec89cd2f4830811bb2f5a04b55a WHIRLPOOL aeea567bf05d1c217e4ce558780f591be9422f0b1df592ac28f1012907bbb3432f4c85fd987944ea89bb334e22a21209f1a6bd54f9a09b215ce79a0f896df47d
diff --git a/sci-libs/scipy/scipy-0.12.1.ebuild b/sci-libs/scipy/scipy-0.12.1.ebuild
deleted file mode 100644
index 34dde8de92c8..000000000000
--- a/sci-libs/scipy/scipy-0.12.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.12.1.ebuild,v 1.6 2014/07/22 17:47:47 zerochaos Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${PN}/${PN}-html.zip -> ${P}-html.zip
-		http://docs.scipy.org/doc/${PN}/${PN}-ref.pdf -> ${P}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt README.txt THANKS.txt LATEST.txt TOCHANGE.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.12.0-gerqf.patch
-		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	# nasty hack to remove weave tests because it is not python3 compat
-	[[ ${TEST_DIR} =~ python3 ]] && rm -r "${TEST_DIR}"/lib/scipy/weave
-#r = scipy.test('full', verbose=10)
-	"${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast',verbose=2)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/.
-		dodoc "${DISTDIR}"/${P}*pdf
-	fi
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.13.2.ebuild b/sci-libs/scipy/scipy-0.13.2.ebuild
deleted file mode 100644
index 950ee7f6ed81..000000000000
--- a/sci-libs/scipy/scipy-0.13.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.2.ebuild,v 1.2 2014/07/22 17:47:47 zerochaos Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-html.zip -> ${PN}-0.13.0-html.zip
-		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-ref.pdf -> ${PN}-0.13.0-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-0.13.0-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| sort | uniq | tr '\n' ','
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast',verbose=2)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/.
-		dodoc "${DISTDIR}"/${PN}*pdf
-	fi
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.13.3.ebuild b/sci-libs/scipy/scipy-0.13.3.ebuild
deleted file mode 100644
index 432c5c83d1fe..000000000000
--- a/sci-libs/scipy/scipy-0.13.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.3.ebuild,v 1.5 2014/07/22 17:47:47 zerochaos Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-html.zip -> ${PN}-0.13.0-html.zip
-		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-ref.pdf -> ${PN}-0.13.0-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (
-		dev-python/mpmath[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-0.13.0-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast',verbose=2)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/.
-		dodoc "${DISTDIR}"/${PN}*pdf
-	fi
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.14.0.ebuild b/sci-libs/scipy/scipy-0.15.0.ebuild
similarity index 90%
rename from sci-libs/scipy/scipy-0.14.0.ebuild
rename to sci-libs/scipy/scipy-0.15.0.ebuild
index d6c918e8d48e..37dbbb7a6675 100644
--- a/sci-libs/scipy/scipy-0.14.0.ebuild
+++ b/sci-libs/scipy/scipy-0.15.0.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.14.0.ebuild,v 1.2 2014/07/22 17:47:47 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.15.0.ebuild,v 1.1 2015/02/19 08:25:29 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 DOC_PV=0.13.0
+
 inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="http://www.scipy.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? (
 		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html.zip -> ${PN}-${DOC_PV}-html.zip
 		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref.pdf -> ${PN}-${DOC_PV}-ref.pdf
@@ -33,9 +35,8 @@ DEPEND="${CDEPEND}
 	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+	"
 
 RDEPEND="${CDEPEND}
 	virtual/python-imaging[${PYTHON_USEDEP}]"
@@ -101,7 +102,6 @@ python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
 		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
 	)
 	distutils-r1_python_prepare_all
 }
@@ -123,8 +123,9 @@ sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
 
 python_install_all() {
 	if use doc; then
-		dohtml -r "${WORKDIR}"/html/.
 		dodoc "${DISTDIR}"/${PN}*pdf
+		docinto html
+		dodoc -r "${WORKDIR}"/html/.
 	fi
 	distutils-r1_python_install_all
 }
diff --git a/sci-physics/lammps/lammps-20141030.ebuild b/sci-physics/lammps/lammps-20141030.ebuild
index efd50fcb1096..250686bb777b 100644
--- a/sci-physics/lammps/lammps-20141030.ebuild
+++ b/sci-physics/lammps/lammps-20141030.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20141030.ebuild,v 1.1 2014/11/17 18:13:36 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20141030.ebuild,v 1.2 2015/02/19 09:05:37 ago Exp $
 
 EAPI=5
 
@@ -45,7 +45,7 @@ SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples gzip lammps-memalign mpi static-libs"
 
 DEPEND="
diff --git a/sys-apps/epoch/epoch-1.2.1.ebuild b/sys-apps/epoch/epoch-1.2.1.ebuild
index 83e98b0b9adc..42a4f722133a 100644
--- a/sys-apps/epoch/epoch-1.2.1.ebuild
+++ b/sys-apps/epoch/epoch-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/epoch/epoch-1.2.1.ebuild,v 1.2 2015/02/13 11:00:11 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epoch/epoch-1.2.1.ebuild,v 1.3 2015/02/19 09:07:43 ago Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Subsentient/${PN}/archive/${MY_PV}.tar.gz -> ${P}.ta
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/install-xattr/install-xattr-0.4.ebuild b/sys-apps/install-xattr/install-xattr-0.4.ebuild
index ccf646752377..d3a1cab5ec9e 100644
--- a/sys-apps/install-xattr/install-xattr-0.4.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/install-xattr/install-xattr-0.4.ebuild,v 1.3 2015/02/18 12:46:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/install-xattr/install-xattr-0.4.ebuild,v 1.5 2015/02/19 10:39:46 ago Exp $
 
 EAPI=5
 DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 8cdda0a48aee..3ce05dee42e6 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,3 +1,4 @@
 DIST openrc-0.12.4.tar.bz2 131914 SHA256 c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c SHA512 14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 WHIRLPOOL 7bdc2c310ee6e87a439574f377a3c1541a118b4122d098d727f6d4464e9f645e5a4d40bedfc82f401b53e640e78494f74fac94f9b6813eb202cc18d1c5391280
+DIST openrc-0.13.10.tar.bz2 150456 SHA256 09a2073899c25f8c9e0268bf77b9534f14baf11a696ec08b463e1b604a434d06 SHA512 384d465f41c3cf02056ac756d32c82e43963bed8659b819127c906c4151354a56cb373ebbcac6d86fc2b06626b5aec87a030efcb2916f3f7684e0d7e627031fe WHIRLPOOL c900e1df2bbfbfa64dbe65a3c61aacb2e46152785a32033e5f54657d70718d3401d104245e3267e8d6af9411a815e49bba94cc63ff89d79f842b0e35b18fddfb
 DIST openrc-0.13.8.tar.bz2 151248 SHA256 317c2c59412eafd2d991369711cd520097b5526af7c78149352846643ea4416f SHA512 7e519c1e57fe273a2c9816b3f9153a498b5b38e2370c6a5ecb1251ea7a6a4bdd82f5ed3a4a5eb491f434227278d4e3fd47f71401ede866e9fdce50ea9ee510ac WHIRLPOOL 3700e993f3d17ce2e8f2cfe86278aac21edf090b5d3f1f692cfa27c5650ab8313b82b6224c37f0bda434dad4aecfeb463472aa6102d67bd4aa7076cf08057307
 DIST openrc-0.13.9.tar.bz2 151021 SHA256 2ce932dfcbaf0ddf5fd79eb9ff75efe3bc9ce5ae76e15155f8418c1aa62756a1 SHA512 5a0da10ad6d8ad53474ec60fa7ded9f4cd3f49c895148c44382f7adf1689271b70959b40f312721b636f60316cbdf3fa42126a0958c8e84e21d23b3e4da27587 WHIRLPOOL e7454605c7588db0282d19cb7d2451cfe73815a7d3e39fb73a571c31495efdfdd21915abb1031b2e8a16df8dac93ef14c3e8e96a9935f74b0df13a30d10c7bd1
diff --git a/sys-apps/openrc/openrc-0.13.10.ebuild b/sys-apps/openrc/openrc-0.13.10.ebuild
new file mode 100644
index 000000000000..f7b604f3c6ff
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.13.10.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.13.10.ebuild,v 1.1 2015/02/19 01:58:47 williamh Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+	tools unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	elibc_glibc? ( >=sys-libs/glibc-2.5 )
+	ncurses? ( sys-libs/ncurses )
+	pam? ( sys-auth/pambase )
+	tools? ( dev-lang/perl )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? ( sys-libs/libselinux )
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		sec-policy/selinux-base-policy
+		sec-policy/selinux-openrc
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKSTATICLIBS=$(usex static-libs)
+	MKTOOLS=$(usex tools)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKPAM=$(usev pam)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install the gentoo pam.d file
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+
+	# install documentation
+	dodoc ChangeLog README README.busybox README.history	\
+		FEATURE-REMOVAL-SCHEDULE
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+
+	ewarn "In this version of OpenRC, the loopback interface no longer"
+	ewarn "satisfies the net virtual."
+	ewarn "If you have services now which do not start because of this,"
+	ewarn "They can be fixed by adding rc_need=\"!net\""
+	ewarn "to the ${EROOT}etc/conf.d/<servicename> file."
+	ewarn "You should also file a bug against the service asking that"
+	ewarn "need net be dropped from the dependencies."
+	ewarn "The bug you file should block the following tracker:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092"
+	ewarn
+
+	# Updated for 0.13.2.
+	ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not"
+	ewarn "fixed correctly in earlier versions of OpenRC."
+	ewarn "The correct fix is implemented in this version, but that"
+	ewarn "means netmount needs to be added to the default runlevel if"
+	ewarn "you are using nfs file systems."
+	ewarn
+
+	elog "You should now update all files in /etc, using etc-update"
+	elog "or equivalent before restarting any services or this host."
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 6a2a486e8f7d..c983c9d5a9bc 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,4 @@
 DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505 SHA512 58de0bf7c43c309c2f8e4b7af16b46608a4ea39cbb280496fe5d43d76ea25545484f4ef62efce18be487c69134e4a038d8787f2c262484f92f7fc6feb3ae2f11 WHIRLPOOL 07389822b9f09cd91f360f3cbdcd0b5bf46ba1750dd1a4ad44fd2813436ef40b447b954d33582ffe83aebde618ecbeac4d2f3231d8afbf3975caf84f52b1053a
 DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
 DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4 WHIRLPOOL 4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d
+DIST systemd-219.tar.xz 3938228 SHA256 5c57113454e37c040d0cb481bd960ae7cf3a3fe0a231ff4945259bc74503f2d9 SHA512 19a92891996723bbd83fe745f365d25b2879a059466670aebb9e9fbb6a79a3ed6e1a93e8b76042605038766cabad3ddb89aff40b4a11ab830ffa7dc64f87234f WHIRLPOOL 440868c47bed26571084009fa86d267c921cd5cbbc63b596c1161ef7f33a1b9427ad315450014cd729c761b27bf42542c3b0b7ca68e09b23fc8f606147e7e9fb
diff --git a/sys-apps/systemd/systemd-219.ebuild b/sys-apps/systemd/systemd-219.ebuild
new file mode 100644
index 000000000000..2f45bbc4affe
--- /dev/null
+++ b/sys-apps/systemd/systemd-219.ebuild
@@ -0,0 +1,483 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-219.ebuild,v 1.1 2015/02/19 02:25:58 floppym Exp $
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+inherit autotools-utils bash-completion-r1 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"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
+	idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python
+	qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.8"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
+	sys-libs/libcap:0=
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? ( net-dns/libidn:0= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:= )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( sys-libs/libseccomp:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
+	terminal? ( >=dev-libs/libevdev-1.2:0=
+		>=x11-libs/libxkbcommon-0.5:0=
+		>=x11-libs/libdrm-2.4:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	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-auth/nss-myhostname
+	!<sys-libs/glibc-2.14
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd]
+	>=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:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=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 )
+	python? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	terminal? ( media-fonts/unifont )
+	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
+		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+		~TIMERFD ~TMPFS_XATTR
+		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+		~!SYSFS_DEPRECATED_V2"
+
+	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+
+	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
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	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=(
+		# disable -flto since it is an optimization flag
+		# and makes distcc less effective
+		cc_cv_CFLAGS__flto=no
+
+		# Workaround for bug 516346
+		--enable-dependency-tracking
+
+		--disable-maintainer-mode
+		--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
+		# For testing.
+		--with-rootprefix="${ROOTPREFIX-/usr}"
+		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# no deps
+		--enable-efi
+		--enable-ima
+
+		# Optional components/dependencies
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable apparmor)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable curl libcurl)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable elfutils)
+		$(use_enable gcrypt)
+		$(use_enable gudev)
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable idn libidn)
+		$(multilib_native_use_enable importd)
+		$(multilib_native_use_enable importd bzip2)
+		$(multilib_native_use_enable importd zlib)
+		$(multilib_native_use_enable introspection)
+		$(use_enable kdbus)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable nat libiptc)
+		$(multilib_native_use_enable pam)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with python)
+		$(multilib_native_use_enable python python-devel)
+		$(multilib_native_use_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable terminal)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+		$(multilib_native_use_enable xkb xkbcommon)
+
+		# 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
+
+		# dbus paths
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+
+		--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+	)
+
+	if ! multilib_is_native_abi; then
+		myeconfargs+=(
+			MOUNT_{CFLAGS,LIBS}=' '
+
+			ac_cv_search_cap_init=
+			ac_cv_header_sys_capability_h=yes
+		)
+	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: $(BUILT_SOURCES)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+		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
+
+	# install compat pkg-config files
+	# Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped.
+	local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
+	emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
+		pkgconfiglib_DATA="${pcfiles[*]}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	einstalldocs
+
+	if use sysv-utils; then
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+		done
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+	else
+		# 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
+	fi
+
+	# 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 \
+		/var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+}
+
+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
+}
+
+migrate_net_name_slot() {
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${EROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ -e ${net_setup_link} ]]; then
+		net_move=no
+	elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
+		net_move=yes
+	elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+		net_move=yes
+		net_name_slot_sym=yes
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $? || FAIL=1
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+	use http && newusergroup systemd-journal-gateway
+
+	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 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	# Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
+	migrate_net_name_slot
+
+	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 [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then
+		ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable"
+		ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf"
+		ewarn "to /run/systemd/resolve/resolv.conf"
+		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
+
+	if has_version sys-apps/openrc &&
+		! has_version sys-fs/udev-init-scripts; then
+		elog "If you plan to boot using OpenRC and udev or eudev, you"
+		elog "need to install the udev-init-scripts package."
+	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-auth/bioapi/bioapi-1.2.4.ebuild b/sys-auth/bioapi/bioapi-1.2.4.ebuild
index 21010e447e06..4586424e9a12 100644
--- a/sys-auth/bioapi/bioapi-1.2.4.ebuild
+++ b/sys-auth/bioapi/bioapi-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.4.ebuild,v 1.1 2014/05/04 15:51:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.4.ebuild,v 1.2 2015/02/19 09:03:07 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://bioapi-linux.googlecode.com/files/${PN}_${PV}.tar.gz"
 
 LICENSE="bioapi"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs"
 
 S=${WORKDIR}/bioapi-linux
diff --git a/sys-devel/dragonegg/Manifest b/sys-devel/dragonegg/Manifest
index dc2298aa363b..eaa221f4c07e 100644
--- a/sys-devel/dragonegg/Manifest
+++ b/sys-devel/dragonegg/Manifest
@@ -1,4 +1,2 @@
-DIST dragonegg-3.5.0.src.tar.xz 373932 SHA256 591133384cbdf329fa12975689e108e8b7c6272333749da6a6633a2b606234ec SHA512 10d8a59442c4469c34e3314de3a7dfba0afe6c7fbedb2a5d8550f2e0b91d3e040585b1467c18944a7cb08bbdd4250681f080f3d932c6ea9ae0e29e593f6527f6 WHIRLPOOL eabbc8fdd6f9aa8f027f95f71eaa3d55c676f3ae61ba38537ddb5e24319ae090f80db62e9e85957ee9225c39ffa5cb228e4184b6676dcd72857455d002158996
 DIST dragonegg-3.5.1.src.tar.xz 374928 SHA256 65e7974a34406463cdfb8c0badd4dfe293ebe771a3d00c4d674d73c8007706e6 SHA512 546bef95aeea39e677b7e20a6d3085e3acac199dbebac12aa38b0991dc6420a07dd4e80466fd5a91285411095b33b0a23a4973dc911667fb4cc3461ef3af5a22 WHIRLPOOL f389644ad8829fb4be37ec1472ef6f5e2ee0f5a52e61395180ba97b70d624c5480463a77d1b4899a9472ec9771bb9789f1d5521e65edc2a9e3ff4eba4fb41b99
-DIST llvm-3.5.0.src.tar.xz 11735940 SHA256 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03 SHA512 b4d0f325dbdb0a8f10e5fd031954ef4b1971d8f99f4e4b53834801a2b74a7acde3f77c655c8355b407424b363edfb10f71d85fc370356dc52af5c636a1bba197 WHIRLPOOL 561520823468b61c63df8e13f876b7ac586eb1e52c256e9a36370e5d46e8cef3937655c36fbb51eebd3680fab67412e7c777479477fc728e7a8f35420e573ef1
 DIST llvm-3.5.1.src.tar.xz 11869356 SHA256 bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15 SHA512 a643ff173627e813b26077829b1af801b75daa5dcea540c4f05366ed57ef6aeafaf8b3fe4208d4c1b303a048a90ddac48a23488480c165637ae9218de140ae55 WHIRLPOOL 798ad46bc21570d8e5b0caadf2c0b434382fd78bfea5a08097fa001019b749b828e56ffe330435e5f3556700e8b0bee29e4139a7ff6b2824bb83dcc8caba2606
diff --git a/sys-devel/dragonegg/dragonegg-3.5.0.ebuild b/sys-devel/dragonegg/dragonegg-3.5.0.ebuild
deleted file mode 100644
index 8bed3ff9669f..000000000000
--- a/sys-devel/dragonegg/dragonegg-3.5.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.5.0.ebuild,v 1.1 2014/09/17 23:13:12 voyageur Exp $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="GCC plugin that uses LLVM for optimization and code generation"
-HOMEPAGE="http://dragonegg.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	test? ( http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.xz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="test"
-
-DEPEND=">=sys-devel/gcc-4.5
-	=sys-devel/llvm-${PV}*"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}.src
-
-src_compile() {
-	# GCC: compiler to use plugin with
-	emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1
-}
-
-src_test() {
-	# GCC languages are determined via locale-dependant gcc -v output
-	export LC_ALL=C
-
-	emake LIT_DIR="${WORKDIR}"/llvm-${PV}.src/utils/lit check
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)
-	doexe dragonegg.so
-
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "To use dragonegg, run gcc as usual, with an extra command line argument:"
-	elog "	-fplugin=/usr/$(get_libdir)/dragonegg.so"
-	elog "If you change the active gcc profile, or update gcc to a new version,"
-	elog "you will have to remerge this package to update the plugin"
-}
diff --git a/sys-devel/dragonegg/dragonegg-3.5.1.ebuild b/sys-devel/dragonegg/dragonegg-3.5.1.ebuild
index 98ae5a6cde88..15f6746eaf6d 100644
--- a/sys-devel/dragonegg/dragonegg-3.5.1.ebuild
+++ b/sys-devel/dragonegg/dragonegg-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.5.1.ebuild,v 1.1 2015/01/21 09:26:42 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.5.1.ebuild,v 1.2 2015/02/18 21:33:18 voyageur Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
@@ -15,12 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="test"
 
-DEPEND=">=sys-devel/gcc-4.5
+DEPEND=">=sys-devel/gcc-4.5:*
 	=sys-devel/llvm-${PV}*"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}.src
 
+pkg_pretend() {
+	# Bug #511640: gcc 4.9 removed a required header
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-version) > 4.8 || $(gcc-version) < 4.5 ]] && \
+			die 'The active compiler needs to be gcc 4.[5-8])'
+	fi
+}
+
 src_compile() {
 	# GCC: compiler to use plugin with
 	emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1
diff --git a/sys-devel/dragonegg/dragonegg-9999.ebuild b/sys-devel/dragonegg/dragonegg-9999.ebuild
index ac428252b1c9..59f6df981a03 100644
--- a/sys-devel/dragonegg/dragonegg-9999.ebuild
+++ b/sys-devel/dragonegg/dragonegg-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-9999.ebuild,v 1.7 2014/09/17 23:13:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-9999.ebuild,v 1.8 2015/02/18 21:33:18 voyageur Exp $
 
 EAPI=5
 inherit git-r3 multilib toolchain-funcs
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND=">=sys-devel/gcc-4.5
+DEPEND=">=sys-devel/gcc-4.5:*
 	~sys-devel/llvm-${PV}"
 RDEPEND="${DEPEND}"
 
diff --git a/sys-libs/mtdev/mtdev-1.1.5.ebuild b/sys-libs/mtdev/mtdev-1.1.5.ebuild
index ea83d276102a..d945b2c5be64 100644
--- a/sys-libs/mtdev/mtdev-1.1.5.ebuild
+++ b/sys-libs/mtdev/mtdev-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/mtdev/mtdev-1.1.5.ebuild,v 1.2 2015/02/18 15:56:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/mtdev/mtdev-1.1.5.ebuild,v 1.3 2015/02/19 08:51:29 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://bitmath.org/code/mtdev/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-2.6.31"
diff --git a/www-client/chromium/chromium-42.0.2305.3.ebuild b/www-client/chromium/chromium-42.0.2305.3.ebuild
index bb838dd20b87..41ccfb2fefd1 100644
--- a/www-client/chromium/chromium-42.0.2305.3.ebuild
+++ b/www-client/chromium/chromium-42.0.2305.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2305.3.ebuild,v 1.1 2015/02/18 09:22:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2305.3.ebuild,v 1.2 2015/02/19 11:22:31 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -392,10 +392,16 @@ src_configure() {
 	myconf+="
 		-Dlogging_like_official_build=1"
 
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
 	# Never use bundled gold binary. Disable gold linker flags for now.
 	# Do not use bundled clang.
 	myconf+="
-		-Dclang=0
+		-Dclang_use_chrome_plugins=0
 		-Dhost_clang=0
 		-Dlinux_use_bundled_binutils=0
 		-Dlinux_use_bundled_gold=0
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index ebc32eae8367..4d27573cf5d7 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_41.0.2272.53-1_amd64.deb 48018268 SHA256 12f6a744caa37f8f4917e1e1132f89d550cb092aea3cb16ea2fdf15df444b95c SHA512 94b3cc0100bb442d8fd756d8f3e575f1a92a7dd37a69dd188e5491848c8a8a98b34a3b774a65ddd671a08c558ccbf469618ca6aec11a7405fe22f5aa75e3306a WHIRLPOOL 73308b38ef959b77244f0094fa969f0561c496dd1ac880e1330915e0bdef210d27b07a26dacdb7967400e20197a27149c2dd29c83198dd7fe1a7d27309fe9c77
-DIST google-chrome-beta_41.0.2272.53-1_i386.deb 46610122 SHA256 d79b8e11f684916995fcd0ad3c49f30a7821f0cc6b7f087aff25317065757d89 SHA512 5b17e3ef390db70e3f12b80ba1a26114cd6fc60dbcd1e29e636fcb6d6ca436ea0bd97aa62d5b6f71e75390710b28acceeb04f28004c954298e37140ae047fc70 WHIRLPOOL 0299f81c0125ca060ceea9c1e407f07fbf0597e78c58f38d95bf17dcd280b2155776267f17f5dbadb4080ed93bbe0f6c4a3b2ffb56eaffebaf40cea6b9ba4bcb
+DIST google-chrome-beta_41.0.2272.63-1_amd64.deb 47035568 SHA256 b64cd68e6da3e396be3730389fa5c341252cc3e060494bb88f53440b5585d51f SHA512 a0d9ce1bc77b889afbb0339883f44674db90d4d5762cbb7854c9a4d86db4b47cd5205b5157ec1f9b23f61302a0cbabcec166ee543474dd2e318ef7d6e3a2762c WHIRLPOOL 522275c7ec07537474e1e7230d746e67fce474edb0dc37f84c0ab8a3d43381f0fa0728d522ab4354622d19a1c41c07db06d119edb58a1ae613f1fbc6dc8c784c
+DIST google-chrome-beta_41.0.2272.63-1_i386.deb 46066914 SHA256 b9aa3426bea600f564c5942745de78f44fe5580b3b9f46b653c4e11d25f3e4e2 SHA512 29368221cba3b8d29e28dc0986af7f38922886b8b5aca304e6ec14ef99d66dbd1572844646bffb76ce0ed0451bcd655681575542a65c7b85905e00a8b7ee2fbd WHIRLPOOL 4676e546a6ee765ddee33f3a47f6dc5093fefe5e43cb13bc6553be3191b62cf4a3c8e79dcc2d0428c2d01df73ed0701dcb77713212d6f112aa4103552572954f
diff --git a/www-client/google-chrome-beta/google-chrome-beta-41.0.2272.53_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-41.0.2272.63_p1.ebuild
similarity index 98%
rename from www-client/google-chrome-beta/google-chrome-beta-41.0.2272.53_p1.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-41.0.2272.63_p1.ebuild
index 34b761f43055..eead35e781a5 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-41.0.2272.53_p1.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-41.0.2272.63_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/google-chrome-beta-41.0.2272.53_p1.ebuild,v 1.1 2015/02/12 15:17:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/google-chrome-beta-41.0.2272.63_p1.ebuild,v 1.1 2015/02/19 01:22:15 floppym Exp $
 
 EAPI="5"
 
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 1514f9cda800..4599785a4f2f 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_42.0.2298.0-1_amd64.deb 46016612 SHA256 7b9466f43b65945ac7a4620381e7d80520124abb382c10711fab011678823975 SHA512 e94407aaf58dd9e22091d0a184cc4856481bf683240916467f5cd03bef9cfd298c26dde3c2e754b569ce2b03516ccf1fb4af8726f8162e1a5b0639fbc5686e83 WHIRLPOOL b81e23c79d58f1afe2a7c70f49b0cbd8be3e5b84f1d2bd8d5358cca702ec19c670d622a5a52aa253802b3c0acf724a05062e5478b752797720ce14152f2191ec
-DIST google-chrome-unstable_42.0.2298.0-1_i386.deb 45639958 SHA256 56ca66e381b127abdb2643eaa89d37a7b8055627ee3263b5dfaf0e5e364194d0 SHA512 1e59c22a9b4963c312951fa23d055078de9bfa127f37215e143de3a81bd359a8f8fcda8ec61a46c61b31746ca2a0409725754f21ac6b0699c622ec6ab4f3558d WHIRLPOOL 675a02b7d9a6d5f6178d1a3e1b71e9897d699156110f6c5983be443f158351b0ec0666c342dfdab1d4cecb01f3ac8ca76cc30cadcc239305d50da45ba80a720e
+DIST google-chrome-unstable_42.0.2305.3-1_amd64.deb 45756250 SHA256 a70be2b4e298393f3e3369ebde217712b4fca7e21e32e860ea86f82fe7de9060 SHA512 c43fbf587f90767b28e0c6bdad98dd72c643ea270667684ab3fe1b2690c1f15cc67b19a6b3a421efb5ba618b33a61717aa16910e2c8d8b3dc0a528b757c26744 WHIRLPOOL b9f1256469487fdb81bc4d6381ec05594f8e08ec975b08d8e614ac9dde1e456cc04c02aff7982c3f1035bab8ed294632c6bf5de150febc484a6aea2623bded16
+DIST google-chrome-unstable_42.0.2305.3-1_i386.deb 45616272 SHA256 e74b5ccf87e4b4a3729dbfe50927a75d6e8b77cf1d763e1ce717ebd9aaf3b5f7 SHA512 deea916b53bb7a14079cf75e1bc01e287de93359a582fac5071da950ca8753fccfa4f201a81325b9166c33b785b0dd6608a0359a5b3c114a365777c983d596d6 WHIRLPOOL e2a656c6cbc2aff23f4163bd57d5385673b126be4df28562df440cdeb08f7f3a5c2f54c73c9b90a2ba3e3793f6820bb6f261abab0b02e82af1195dbae85a6c53
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-42.0.2298.0_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-42.0.2305.3_p1.ebuild
similarity index 97%
rename from www-client/google-chrome-unstable/google-chrome-unstable-42.0.2298.0_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-42.0.2305.3_p1.ebuild
index a76d83e0e3ec..4734cd70a980 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-42.0.2298.0_p1.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-42.0.2305.3_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-42.0.2298.0_p1.ebuild,v 1.1 2015/02/11 00:38:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-42.0.2305.3_p1.ebuild,v 1.1 2015/02/19 01:21:34 floppym Exp $
 
 EAPI="5"
 
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 5b89c4f58098..fdc89b3aecab 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_41.0.2272.53-1_amd64.deb 48018268 SHA256 12f6a744caa37f8f4917e1e1132f89d550cb092aea3cb16ea2fdf15df444b95c SHA512 94b3cc0100bb442d8fd756d8f3e575f1a92a7dd37a69dd188e5491848c8a8a98b34a3b774a65ddd671a08c558ccbf469618ca6aec11a7405fe22f5aa75e3306a WHIRLPOOL 73308b38ef959b77244f0094fa969f0561c496dd1ac880e1330915e0bdef210d27b07a26dacdb7967400e20197a27149c2dd29c83198dd7fe1a7d27309fe9c77
-DIST google-chrome-beta_41.0.2272.53-1_i386.deb 46610122 SHA256 d79b8e11f684916995fcd0ad3c49f30a7821f0cc6b7f087aff25317065757d89 SHA512 5b17e3ef390db70e3f12b80ba1a26114cd6fc60dbcd1e29e636fcb6d6ca436ea0bd97aa62d5b6f71e75390710b28acceeb04f28004c954298e37140ae047fc70 WHIRLPOOL 0299f81c0125ca060ceea9c1e407f07fbf0597e78c58f38d95bf17dcd280b2155776267f17f5dbadb4080ed93bbe0f6c4a3b2ffb56eaffebaf40cea6b9ba4bcb
+DIST google-chrome-beta_41.0.2272.63-1_amd64.deb 47035568 SHA256 b64cd68e6da3e396be3730389fa5c341252cc3e060494bb88f53440b5585d51f SHA512 a0d9ce1bc77b889afbb0339883f44674db90d4d5762cbb7854c9a4d86db4b47cd5205b5157ec1f9b23f61302a0cbabcec166ee543474dd2e318ef7d6e3a2762c WHIRLPOOL 522275c7ec07537474e1e7230d746e67fce474edb0dc37f84c0ab8a3d43381f0fa0728d522ab4354622d19a1c41c07db06d119edb58a1ae613f1fbc6dc8c784c
+DIST google-chrome-beta_41.0.2272.63-1_i386.deb 46066914 SHA256 b9aa3426bea600f564c5942745de78f44fe5580b3b9f46b653c4e11d25f3e4e2 SHA512 29368221cba3b8d29e28dc0986af7f38922886b8b5aca304e6ec14ef99d66dbd1572844646bffb76ce0ed0451bcd655681575542a65c7b85905e00a8b7ee2fbd WHIRLPOOL 4676e546a6ee765ddee33f3a47f6dc5093fefe5e43cb13bc6553be3191b62cf4a3c8e79dcc2d0428c2d01df73ed0701dcb77713212d6f112aa4103552572954f
 DIST google-chrome-stable_40.0.2214.111-1_amd64.deb 48807598 SHA256 0a1f0a1ff5b4472430b69f48ab77bf9f535a5a87074d15410ea017d796831544 SHA512 ce4d38f39e4b4a0ab4304d6940cfbf3da004f02970c173766c45b73adc87d3ae7e593bd75d0bbeb24c22d914c59ffc1fe06286cb84f0a53e2bfcf8a428c6528c WHIRLPOOL bd2cf1795eb2d96f026b8b8a6a09d3ec1f47fdc9e2a73edadacd19ba97ab5edb88c0d6d41ed1910c14b1c0c800c3825346099d908ea1bc9c479e1a6a6de90a53
 DIST google-chrome-stable_40.0.2214.111-1_i386.deb 48480280 SHA256 e511110eea8f49540370f83b2ed75a982493853543dea7e4921faefde1a87818 SHA512 218a50527407aadb31759c612aef71d6e5b1226272d9fb9d851ae72182dd05115aaf762c8ff87c3fafaeeae5d93b3c1be3aa0ca94053363710f1000e7ac2703d WHIRLPOOL 8c5579d5367d6146aa095791d8325262772e4892847ab0264878de57d36e3065ec71e88d5823fee602311cd7b26afca3025b81fec3773c56df957aa909734091
-DIST google-chrome-unstable_42.0.2298.0-1_amd64.deb 46016612 SHA256 7b9466f43b65945ac7a4620381e7d80520124abb382c10711fab011678823975 SHA512 e94407aaf58dd9e22091d0a184cc4856481bf683240916467f5cd03bef9cfd298c26dde3c2e754b569ce2b03516ccf1fb4af8726f8162e1a5b0639fbc5686e83 WHIRLPOOL b81e23c79d58f1afe2a7c70f49b0cbd8be3e5b84f1d2bd8d5358cca702ec19c670d622a5a52aa253802b3c0acf724a05062e5478b752797720ce14152f2191ec
-DIST google-chrome-unstable_42.0.2298.0-1_i386.deb 45639958 SHA256 56ca66e381b127abdb2643eaa89d37a7b8055627ee3263b5dfaf0e5e364194d0 SHA512 1e59c22a9b4963c312951fa23d055078de9bfa127f37215e143de3a81bd359a8f8fcda8ec61a46c61b31746ca2a0409725754f21ac6b0699c622ec6ab4f3558d WHIRLPOOL 675a02b7d9a6d5f6178d1a3e1b71e9897d699156110f6c5983be443f158351b0ec0666c342dfdab1d4cecb01f3ac8ca76cc30cadcc239305d50da45ba80a720e
+DIST google-chrome-unstable_42.0.2305.3-1_amd64.deb 45756250 SHA256 a70be2b4e298393f3e3369ebde217712b4fca7e21e32e860ea86f82fe7de9060 SHA512 c43fbf587f90767b28e0c6bdad98dd72c643ea270667684ab3fe1b2690c1f15cc67b19a6b3a421efb5ba618b33a61717aa16910e2c8d8b3dc0a528b757c26744 WHIRLPOOL b9f1256469487fdb81bc4d6381ec05594f8e08ec975b08d8e614ac9dde1e456cc04c02aff7982c3f1035bab8ed294632c6bf5de150febc484a6aea2623bded16
+DIST google-chrome-unstable_42.0.2305.3-1_i386.deb 45616272 SHA256 e74b5ccf87e4b4a3729dbfe50927a75d6e8b77cf1d763e1ce717ebd9aaf3b5f7 SHA512 deea916b53bb7a14079cf75e1bc01e287de93359a582fac5071da950ca8753fccfa4f201a81325b9166c33b785b0dd6608a0359a5b3c114a365777c983d596d6 WHIRLPOOL e2a656c6cbc2aff23f4163bd57d5385673b126be4df28562df440cdeb08f7f3a5c2f54c73c9b90a2ba3e3793f6820bb6f261abab0b02e82af1195dbae85a6c53
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-42.0.2298.0_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-41.0.2272.63_beta1.ebuild
similarity index 96%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-42.0.2298.0_alpha1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-41.0.2272.63_beta1.ebuild
index 6752d793f0ce..c3433c13d94f 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-42.0.2298.0_alpha1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-41.0.2272.63_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-42.0.2298.0_alpha1.ebuild,v 1.1 2015/02/11 00:38:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-41.0.2272.63_beta1.ebuild,v 1.1 2015/02/19 01:22:33 floppym Exp $
 
 EAPI=5
 
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-41.0.2272.53_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-42.0.2305.3_alpha1.ebuild
similarity index 96%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-41.0.2272.53_beta1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-42.0.2305.3_alpha1.ebuild
index 18f00732e55a..25723ca0e3af 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-41.0.2272.53_beta1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-42.0.2305.3_alpha1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-41.0.2272.53_beta1.ebuild,v 1.1 2015/02/12 15:18:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-42.0.2305.3_alpha1.ebuild,v 1.1 2015/02/19 01:22:33 floppym Exp $
 
 EAPI=5
 
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 196e3cb776d1..8b24ef557837 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -3,3 +3,4 @@ DIST varnish-3.0.6.tar.gz 2049810 SHA256 840ded8f25e7343117f6e3e2015759118f1d2db
 DIST varnish-4.0.0.tar.gz 2372630 SHA256 4bbf73656be11687cbb8c7d4a7315786081687664b40a8ccbe67b36f8c0b1c17 SHA512 5eb3806f6c7c46438b6ebbe30c42f5a6afc53a9fa9e8f4b809c7d18b465712640950601be9873810a0f408865fba6ae9d18e46e4f22c89cc3a2e0c351753ac71 WHIRLPOOL 431dad47430a7b2a2eba3dd635eb487cb4d112a9ebdf6a3cb946b0bd8476653bded2d29128bcac1f98c6b3dfc3d7bc9c32f25ea76bccc9f427519f8dc36e2eb6
 DIST varnish-4.0.1.tar.gz 1877657 SHA256 49c3cebc89cb08fbc89d6680c1c8b42efc9313888172f3cdbdae7324b5c8f35b SHA512 e1ae846ff5b5e6ac0b694e8b197f9f7ec8c47677cbaaab6c0c490b6d5fa52f58f84fa3001bee8fe57451328cb809be0b5be55ddb41bd9c2444f23e0af582116b WHIRLPOOL 3013ae885a1eb6d44600b7c5513109a526cbed8f6bf687a81fa31111088713d68a9a059a67912966d7bed3b6404988c5fc785f02c91a63ea1f2a5037caf21e7b
 DIST varnish-4.0.2.tar.gz 1853668 SHA256 d9fb6a6eaf05bbb0c8eb5855556a4b092183b2c1a61281bfd73adf83a304555b SHA512 262bef5823f56c70fa9c7f24225b02b0218889c216143f63bb11db978ca7eddb174f605a5e48a4e774d88b20af5f5845bb2a6aef6fa3aaaf7cacd8c7c17cb82f WHIRLPOOL 35977069c6908a2fd731984585b447055730a288300de8709d83bec2df3677337535970c503b3b3d26635b0c747e7c387a423d93e776a755b8d8f0078c845696
+DIST varnish-4.0.3.tar.gz 1866760 SHA256 94b9a174097f47db2286acd2c35f235e49a2b7a9ddfdbd6eb7aa4da9ae8f8206 SHA512 db7bb141afd4617ac95573983dc30591b0eb9bc1af06df1094f2c1eeac539da936afb4a239d2f446d3c3a51b88a781b7f9f6d9a0b2028eaf0e7049ea2159d883 WHIRLPOOL 942456e19be427859283959dabe5522667519d36decbc598c8ee1e949767ea7435469393289d4373db6abac5275e50a95fc3799a837dc17740a490b4912bfe6f
diff --git a/www-servers/varnish/varnish-4.0.3.ebuild b/www-servers/varnish/varnish-4.0.3.ebuild
new file mode 100644
index 000000000000..c8337beba4c2
--- /dev/null
+++ b/www-servers/varnish/varnish-4.0.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-4.0.3.ebuild,v 1.1 2015/02/19 12:16:33 blueness Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+
+inherit user autotools-utils eutils systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="http://www.varnish-cache.org/"
+SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	|| ( dev-libs/libedit sys-libs/readline )
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses"
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+DOCS=( README doc/changes.rst )
+
+AUTOTOOLS_AUTORECONF="yes"
+
+pkg_setup() {
+	ebegin "Creating varnish user and group"
+	enewgroup varnish 40
+	enewuser varnish 40 -1 /var/lib/varnish varnish
+	eend $?
+}
+
+src_prepare() {
+	# Remove bundled libjemalloc. We also fix
+	# automagic dep in our patches, bug #461638
+	rm -rf lib/libjemalloc
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable jit pcre-jit )
+		$(use_with jemalloc)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd-r1 varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	dodir /var/log/varnish/
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins lib/libvmod_std/vmod.vcc
+	doins etc/example.vcl
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
+
+pkg_postinst () {
+	elog "No demo-/sample-configfile is included in the distribution.  Please"
+	elog "read the man-page for more info.  A sample configuration proxying"
+	elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
+}
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
index 925a2c462b00..5ec40a37801f 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild,v 1.2 2015/02/18 15:56:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild,v 1.3 2015/02/19 08:51:31 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 ~s390 ~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=""
 RDEPEND="x11-libs/libXfont"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/bitmap/bitmap-1.0.8.ebuild b/x11-apps/bitmap/bitmap-1.0.8.ebuild
index d7d9175d34dc..fa289ec8f22e 100644
--- a/x11-apps/bitmap/bitmap-1.0.8.ebuild
+++ b/x11-apps/bitmap/bitmap-1.0.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-1.0.8.ebuild,v 1.2 2015/02/18 15:56:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-1.0.8.ebuild,v 1.3 2015/02/19 08:51:33 ago Exp $
 
 EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild
index d5db2235e028..e1b72209f2e9 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild,v 1.2 2015/02/18 15:56:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild,v 1.3 2015/02/19 08:51:35 ago Exp $
 
 EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="list fonts served by X font server"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-proto/xproto
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
index bc0856a5bf02..e81e6cafa0dd 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-1.0.6.ebuild,v 1.2 2015/02/18 15:56:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-1.0.6.ebuild,v 1.3 2015/02/19 08:51:37 ago Exp $
 
 EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/iceauth/iceauth-1.0.7.ebuild b/x11-apps/iceauth/iceauth-1.0.7.ebuild
index c03e0d211258..999a9f7fc21d 100644
--- a/x11-apps/iceauth/iceauth-1.0.7.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-1.0.7.ebuild,v 1.2 2015/02/18 15:56:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-1.0.7.ebuild,v 1.3 2015/02/19 08:51:39 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libICE"
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild
index 9e01be400afa..c925e6993fb8 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild,v 1.5 2015/02/18 15:56:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild,v 1.7 2015/02/19 08:51:42 ago Exp $
 
 EAPI=5
 
@@ -9,14 +9,14 @@ PYTHON_COMPAT=( python{3_3,3_4} )
 inherit python-single-r1 xorg-2
 
 DESCRIPTION="Intel GPU userland tools"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="python video_cards_nouveau"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
 
 DEPEND="dev-libs/glib:2
 	>=x11-libs/cairo-1.12.0
-	>=x11-libs/libdrm-2.4.47[video_cards_intel,video_cards_nouveau?]
+	>=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
 	>=x11-libs/libpciaccess-0.10
 	python? ( ${PYTHON_DEPS} )"
 RDEPEND="${DEPEND}"
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index 19b9f8b2d091..1976d2a92039 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild,v 1.5 2015/02/18 15:56:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild,v 1.6 2015/02/19 08:51:44 ago Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="egl gles1 gles2"
 
 RDEPEND="
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
index 62b2cfc6dc86..673723ab46e3 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild,v 1.2 2015/02/18 15:56:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild,v 1.3 2015/02/19 08:51:47 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libfontenc
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
index 684ffab6ccad..af1d34df6807 100644
--- a/x11-apps/rgb/rgb-1.0.6.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/rgb-1.0.6.ebuild,v 1.2 2015/02/18 15:56:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/rgb-1.0.6.ebuild,v 1.3 2015/02/19 08:51:49 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-apps/sessreg/sessreg-1.1.0.ebuild b/x11-apps/sessreg/sessreg-1.1.0.ebuild
index e53329e4d70c..b85344ec9573 100644
--- a/x11-apps/sessreg/sessreg-1.1.0.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/sessreg-1.1.0.ebuild,v 1.2 2015/02/18 15:56:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/sessreg-1.1.0.ebuild,v 1.3 2015/02/19 08:51:51 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="manage utmp/wtmp entries for non-init clients"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-apps/xauth/xauth-1.0.9-r1.ebuild b/x11-apps/xauth/xauth-1.0.9-r1.ebuild
index 5922bde2d7a9..cc88fad67218 100644
--- a/x11-apps/xauth/xauth-1.0.9-r1.ebuild
+++ b/x11-apps/xauth/xauth-1.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.9-r1.ebuild,v 1.3 2015/02/18 15:56:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.9-r1.ebuild,v 1.4 2015/02/19 08:51:53 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit autotools-utils xorg-2
 
 DESCRIPTION="X authority file utility"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcalc/xcalc-1.0.6.ebuild b/x11-apps/xcalc/xcalc-1.0.6.ebuild
index 320f72825a1b..862cd9cfbf11 100644
--- a/x11-apps/xcalc/xcalc-1.0.6.ebuild
+++ b/x11-apps/xcalc/xcalc-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/xcalc-1.0.6.ebuild,v 1.2 2015/02/18 15:56:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/xcalc-1.0.6.ebuild,v 1.3 2015/02/19 08:51:56 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="scientific calculator for X"
 
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild
index 9bce83b572fd..adeefebe13c9 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild,v 1.2 2015/02/18 15:56:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild,v 1.3 2015/02/19 08:51:58 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="create an X cursor file from a collection of PNG images"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/xinit-1.3.3-r1.ebuild b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
index 6190a4687d5b..96788c681388 100644
--- a/x11-apps/xinit/xinit-1.3.3-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.3-r1.ebuild,v 1.4 2015/02/18 15:56:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.3-r1.ebuild,v 1.5 2015/02/19 08:52:01 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
diff --git a/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild b/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild
index dd3da8b29917..35ebfb5e964c 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild,v 1.2 2015/02/18 15:56:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild,v 1.3 2015/02/19 08:52:03 ago Exp $
 
 EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xrandr/xrandr-1.4.3.ebuild b/x11-apps/xrandr/xrandr-1.4.3.ebuild
index ed95f2671b14..6e0b2dc04377 100644
--- a/x11-apps/xrandr/xrandr-1.4.3.ebuild
+++ b/x11-apps/xrandr/xrandr-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.4.3.ebuild,v 1.2 2015/02/18 15:56:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.4.3.ebuild,v 1.3 2015/02/19 08:52:05 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="primitive command line interface to RandR extension"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.4
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.16.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.16.ebuild
index d1b2786d144a..32be58314cf1 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.16.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.16.ebuild,v 1.3 2015/02/18 15:56:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.16.ebuild,v 1.4 2015/02/19 08:52:08 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild
index 03b98c83e899..4328a2eab03d 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild,v 1.2 2015/02/18 15:56:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild,v 1.3 2015/02/19 08:52:12 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz"
 
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild
index 1def514c1729..f659bf50fca1 100644
--- a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild,v 1.2 2015/02/18 15:56:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild,v 1.3 2015/02/19 08:52:12 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz"
 
diff --git a/x11-base/xorg-server/xorg-server-1.16.4.ebuild b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
index 17c4ee250be0..25195d80dadc 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4.ebuild,v 1.2 2015/02/18 15:56:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4.ebuild,v 1.3 2015/02/19 08:52:12 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/1.16.1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
index e52b2d0f3e0e..b803e0c6fab1 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.3 2015/02/18 15:56:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.4 2015/02/19 08:52:17 ago Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ FOLDER_PREFIX="common/"
 IUSE="debug +modules qt4 static-libs pax_kernel"
 
 LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RESTRICT="bindist test"
 
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.9.1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.9.1.ebuild
index 243f9bdf7c9b..8a743351d75d 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.9.1.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.9.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.9.1.ebuild,v 1.3 2015/02/18 15:57:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.9.1.ebuild,v 1.4 2015/02/19 08:52:20 ago Exp $
 
 EAPI=5
 inherit linux-info xorg-2
 
 DESCRIPTION="Generic Linux input driver"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.12[udev]
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.8.0.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.8.0.ebuild
index 40299c3ab099..5e7a9341435e 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.8.0.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.8.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.8.0.ebuild,v 1.2 2015/02/18 15:57:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.8.0.ebuild,v 1.3 2015/02/19 08:52:22 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Keyboard input driver"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6.3"
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.1.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.1.ebuild
index 4abdce57985d..708159babb3e 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.1.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.1.ebuild,v 1.2 2015/02/18 15:57:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.1.ebuild,v 1.3 2015/02/19 08:52:25 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for mouse input devices"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.7"
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.1.ebuild
index 8a18f01ef994..1fcde6d92995 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.1.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.1.ebuild,v 1.2 2015/02/18 15:57:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.1.ebuild,v 1.3 2015/02/19 08:52:28 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
 
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="kernel_linux"
 
 RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild
index 3b86ec6eb886..bf71591d4b04 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild,v 1.2 2015/02/18 15:57:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild,v 1.3 2015/02/19 08:52:30 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="VMWare mouse input driver"
 IUSE=""
-KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.24.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.24.0.ebuild
index 18a3f44545f0..25de2ac5bf37 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.24.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.24.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.24.0.ebuild,v 1.3 2015/02/18 15:57:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.24.0.ebuild,v 1.4 2015/02/19 08:52:34 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug"
 
 # depend on libwacom for its udev rules, bug #389633
diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-1.0.1.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-1.0.1.ebuild
index 87d2b10c0746..dd5fb1568eb1 100644
--- a/x11-drivers/xf86-video-ast/xf86-video-ast-1.0.1.ebuild
+++ b/x11-drivers/xf86-video-ast/xf86-video-ast-1.0.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/xf86-video-ast-1.0.1.ebuild,v 1.2 2015/02/18 15:57:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/xf86-video-ast-1.0.1.ebuild,v 1.3 2015/02/19 08:52:37 ago Exp $
 
 EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for ASpeedTech cards"
-KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 LICENSE="MIT"
 IUSE=""
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.5.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.5.0.ebuild
index e9ced0cf157e..752c1d0c3352 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.5.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.5.0.ebuild,v 1.2 2015/02/18 15:57:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.5.0.ebuild,v 1.3 2015/02/19 08:52:40 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit linux-info xorg-2
 DESCRIPTION="ATI video driver"
 HOMEPAGE="http://www.x.org/wiki/ati/"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+glamor udev"
 
 RDEPEND=">=x11-libs/libdrm-2.4.58[video_cards_radeon]
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild
index 9d9c09d553dd..de1135baf3d9 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild,v 1.2 2015/02/18 15:57:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild,v 1.3 2015/02/19 08:52:43 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 
 DESCRIPTION="X.Org driver for Intel cards"
 
-KEYWORDS="amd64 ~x86 ~amd64-fbsd -x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd -x86-fbsd"
 IUSE="debug +sna +udev uxa xvmc"
 
 REQUIRED_USE="
diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.9.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.9.0.ebuild
index 84c5674718c9..4ba7488bfe26 100644
--- a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.9.0.ebuild
+++ b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.9.0.ebuild,v 1.2 2015/02/18 15:57:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.9.0.ebuild,v 1.3 2015/02/19 08:52:45 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
 
-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=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.46"
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild
index 20d861b68ffb..a321a6e5a0d7 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild,v 1.2 2015/02/18 15:57:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild,v 1.3 2015/02/19 08:52:49 ago Exp $
 
 EAPI=5
 XORG_DRI="always"
@@ -15,7 +15,7 @@ fi
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
 HOMEPAGE="http://nouveau.freedesktop.org/"
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="glamor"
 
 RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]
diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.3.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.3.ebuild
index 56d042f71780..0a6aa1f2037a 100644
--- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.3.ebuild
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.3.ebuild,v 1.2 2015/02/18 15:57:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.3.ebuild,v 1.3 2015/02/19 08:52:52 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="QEMU QXL paravirt video driver"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="xspice"
 
 RDEPEND="xspice? ( app-emulation/spice )
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild
index c6a7898c23ec..f75d5c27330c 100644
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild
+++ b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild,v 1.2 2015/02/18 15:57:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild,v 1.3 2015/02/19 08:52:54 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for s3 cards"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild
index b46e56c8e5a4..5f95d2034382 100644
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild
+++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild,v 1.2 2015/02/18 15:57:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild,v 1.3 2015/02/19 08:52:56 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Silicon Motion video driver"
 
-KEYWORDS="amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~mips x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild
index eaafe6b81aca..a0c581aa9fd9 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild,v 1.2 2015/02/18 15:57:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild,v 1.3 2015/02/19 08:53:00 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ XORG_DRI=always
 inherit xorg-2
 
 DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
diff --git a/x11-libs/glamor/glamor-0.6.0-r1.ebuild b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
index 1162871add1d..34184a145554 100644
--- a/x11-libs/glamor/glamor-0.6.0-r1.ebuild
+++ b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.6.0-r1.ebuild,v 1.4 2015/02/18 15:57:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.6.0-r1.ebuild,v 1.5 2015/02/19 08:53:03 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ inherit xorg-2 autotools-utils toolchain-funcs
 DESCRIPTION="OpenGL based 2D rendering acceleration library"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gles xv"
 
 RDEPEND=">=x11-base/xorg-server-1.10
diff --git a/x11-libs/libFS/libFS-1.0.6.ebuild b/x11-libs/libFS/libFS-1.0.6.ebuild
index b9fb105d48db..ad091a6896ec 100644
--- a/x11-libs/libFS/libFS-1.0.6.ebuild
+++ b/x11-libs/libFS/libFS-1.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libFS/libFS-1.0.6.ebuild,v 1.2 2015/02/18 15:57:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libFS/libFS-1.0.6.ebuild,v 1.3 2015/02/19 08:53:08 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org FS library"
 
-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="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libICE/libICE-1.0.9.ebuild b/x11-libs/libICE/libICE-1.0.9.ebuild
index 8e6cac5d4b85..cfb383b9baa3 100644
--- a/x11-libs/libICE/libICE-1.0.9.ebuild
+++ b/x11-libs/libICE/libICE-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.9.ebuild,v 1.4 2015/02/18 15:57:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.9.ebuild,v 1.5 2015/02/19 08:53:10 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Inter-Client Exchange library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~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="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXext/libXext-1.3.3.ebuild b/x11-libs/libXext/libXext-1.3.3.ebuild
index 3d5e1c3a0569..bc957ded9938 100644
--- a/x11-libs/libXext/libXext-1.3.3.ebuild
+++ b/x11-libs/libXext/libXext-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.3.3.ebuild,v 1.2 2015/02/18 15:57:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.3.3.ebuild,v 1.3 2015/02/19 08:53:20 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXfont/libXfont-1.5.0.ebuild b/x11-libs/libXfont/libXfont-1.5.0.ebuild
index 99e42545ac28..c7e6856d0084 100644
--- a/x11-libs/libXfont/libXfont-1.5.0.ebuild
+++ b/x11-libs/libXfont/libXfont-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.5.0.ebuild,v 1.2 2015/02/18 15:57:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.5.0.ebuild,v 1.3 2015/02/19 08:53:22 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXft/libXft-2.3.2.ebuild b/x11-libs/libXft/libXft-2.3.2.ebuild
index 3fca1a3c7f9e..8df4916f286f 100644
--- a/x11-libs/libXft/libXft-2.3.2.ebuild
+++ b/x11-libs/libXft/libXft-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.2.ebuild,v 1.3 2015/02/18 15:58:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.2.ebuild,v 1.4 2015/02/19 08:53:25 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xft library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/libXi-1.7.4.ebuild b/x11-libs/libXi/libXi-1.7.4.ebuild
index 6d21d32f725b..0dbe6dc1cbf3 100644
--- a/x11-libs/libXi/libXi-1.7.4.ebuild
+++ b/x11-libs/libXi/libXi-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.7.4.ebuild,v 1.2 2015/02/18 15:58:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.7.4.ebuild,v 1.3 2015/02/19 08:53:28 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/libdrm-2.4.59.ebuild b/x11-libs/libdrm/libdrm-2.4.59.ebuild
index 2dc847b544c7..7534f0abbb82 100644
--- a/x11-libs/libdrm/libdrm-2.4.59.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.59.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.59.ebuild,v 1.2 2015/02/18 15:57:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.59.ebuild,v 1.3 2015/02/19 08:53:06 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ else
 	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
 fi
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
index 05827ea141cf..3522ff457247 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild,v 1.2 2015/02/18 15:57:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild,v 1.3 2015/02/19 08:53:12 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild
index 11a7232dd67e..d47a9ba5b758 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild,v 1.2 2015/02/18 15:57:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild,v 1.3 2015/02/19 08:53:15 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug opengl"
 
 RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/libxcb/libxcb-1.11-r1.ebuild b/x11-libs/libxcb/libxcb-1.11-r1.ebuild
index 97290a625213..4ffa88a16820 100644
--- a/x11-libs/libxcb/libxcb-1.11-r1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.11-r1.ebuild,v 1.2 2015/02/18 15:57:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.11-r1.ebuild,v 1.3 2015/02/19 08:53:18 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~arm64 ~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="selinux xkb"
 SLOT="0/${PV}"
 
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild
index ecbe1c2b451f..d9c62be983df 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild,v 1.4 2015/02/18 15:58:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild,v 1.6 2015/02/19 08:58:33 ago Exp $
 
 EAPI=5
 XORG_EAUTORECONF="yes"
@@ -18,7 +18,7 @@ fi
 inherit xorg-2 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="X doc test"
 
 DEPEND="sys-devel/bison
diff --git a/x11-libs/libxshmfence/libxshmfence-1.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
index fc1a78dec04c..4c3733ffb852 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxshmfence/libxshmfence-1.2.ebuild,v 1.2 2015/02/18 15:58:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxshmfence/libxshmfence-1.2.ebuild,v 1.3 2015/02/19 08:53:34 ago Exp $
 
 EAPI=5
 XORG_MULTILIB=yes
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/pixman/pixman-0.32.6.ebuild b/x11-libs/pixman/pixman-0.32.6.ebuild
index 94b90a8fc522..b2c6a21790c3 100644
--- a/x11-libs/pixman/pixman-0.32.6.ebuild
+++ b/x11-libs/pixman/pixman-0.32.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.32.6.ebuild,v 1.3 2015/02/18 15:58:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.32.6.ebuild,v 1.4 2015/02/19 08:53:36 ago Exp $
 
 EAPI=5
 XORG_MULTILIB=yes
@@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 RDEPEND="abi_x86_32? (
 	!<=app-emulation/emul-linux-x86-gtklibs-20131008
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
index cd1458f1fe5a..a35342cede57 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild,v 1.4 2015/02/18 15:58:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild,v 1.5 2015/02/19 08:53:42 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
index 0e8b179c6501..dbb9e621a757 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild,v 1.3 2015/02/18 15:58:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild,v 1.4 2015/02/19 08:53:44 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-image"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
index dbb57ecbdaf8..f835ddb20942 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild,v 1.3 2015/02/18 15:58:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild,v 1.4 2015/02/19 08:53:46 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-keysyms"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
index b76a7ee37f23..3101b16a92cc 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild,v 1.4 2015/02/18 15:58:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild,v 1.5 2015/02/19 08:53:49 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
index a75d1b1cb50a..5b300a9534e9 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild,v 1.4 2015/02/18 15:58:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild,v 1.5 2015/02/19 08:53:52 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0.ebuild
index 9e9750fa0cc7..2585d9694123 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.4.0.ebuild,v 1.2 2015/02/18 15:58:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.4.0.ebuild,v 1.3 2015/02/19 08:53:39 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xtrans/xtrans-1.3.5.ebuild b/x11-libs/xtrans/xtrans-1.3.5.ebuild
index 81e27c7027f3..1a8b468d9cf2 100644
--- a/x11-libs/xtrans/xtrans-1.3.5.ebuild
+++ b/x11-libs/xtrans/xtrans-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xtrans/xtrans-1.3.5.ebuild,v 1.2 2015/02/18 15:58:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xtrans/xtrans-1.3.5.ebuild,v 1.3 2015/02/19 08:53:55 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~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"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
index 8c7774b38266..a2eecd637f47 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild,v 1.2 2015/02/18 15:58:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild,v 1.3 2015/02/19 08:53:57 ago Exp $
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-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-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="x11-proto/xproto"
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
index 2fb7f3ebad60..23fc003b097f 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild,v 1.1 2014/02/09 13:37:22 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild,v 1.2 2015/02/19 09:04:33 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://qcomicbook.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="debug"
 
 DEPEND="dev-qt/qtgui:4
diff --git a/x11-misc/read-edid/read-edid-3.0.1.ebuild b/x11-misc/read-edid/read-edid-3.0.1.ebuild
index bb21cbeb5198..5a9293e6e0a1 100644
--- a/x11-misc/read-edid/read-edid-3.0.1.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-3.0.1.ebuild,v 1.1 2014/02/05 17:13:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-3.0.1.ebuild,v 1.2 2015/02/19 09:06:57 ago Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 DEPEND=">=dev-libs/libx86-1.1"
 RDEPEND="$DEPEND"
diff --git a/x11-misc/util-macros/util-macros-1.19.0.ebuild b/x11-misc/util-macros/util-macros-1.19.0.ebuild
index 9448cd054e67..f8e08a3a4398 100644
--- a/x11-misc/util-macros/util-macros-1.19.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.19.0.ebuild,v 1.3 2015/02/18 15:58:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.19.0.ebuild,v 1.4 2015/02/19 08:53:59 ago Exp $
 
 EAPI=5
 inherit xorg-2
@@ -8,5 +8,5 @@ inherit xorg-2
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
 DESCRIPTION="X.Org autotools utility macros"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild
index c2e240edffac..6aa9b6bc77e1 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild,v 1.2 2015/02/18 15:58:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild,v 1.3 2015/02/19 08:54:03 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 [[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 LICENSE="MIT"
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild
index e9f14c612c4a..60a5da583c53 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild,v 1.2 2015/02/18 15:58:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild,v 1.3 2015/02/19 08:54:05 ago Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ SRC_URI="http://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86"
 IUSE=""
diff --git a/x11-plugins/bfm/bfm-0.6.4-r2.ebuild b/x11-plugins/bfm/bfm-0.6.4-r2.ebuild
index 5fc895cea51f..98d9b474f028 100644
--- a/x11-plugins/bfm/bfm-0.6.4-r2.ebuild
+++ b/x11-plugins/bfm/bfm-0.6.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/bfm-0.6.4-r2.ebuild,v 1.1 2015/01/20 10:02:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/bfm-0.6.4-r2.ebuild,v 1.2 2015/02/19 09:07:48 ago Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.jnrowe.ukfsn.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="gkrellm"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
index e4a94217011b..ac397392e508 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild,v 1.1 2014/11/13 14:11:30 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild,v 1.2 2015/02/19 09:04:03 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/d-torrance/${PN}/archive/debian/${PV/_p/+}-1.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="nls xinerama"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-proto/fontsproto/fontsproto-2.1.3.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
index 2cd59450b424..2ae3e3b7ea61 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontsproto/fontsproto-2.1.3.ebuild,v 1.2 2015/02/18 15:58:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontsproto/fontsproto-2.1.3.ebuild,v 1.3 2015/02/19 08:54:07 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Fonts protocol headers"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/inputproto/inputproto-2.3.1.ebuild b/x11-proto/inputproto/inputproto-2.3.1.ebuild
index 29986b00e34e..f78be4cba11a 100644
--- a/x11-proto/inputproto/inputproto-2.3.1.ebuild
+++ b/x11-proto/inputproto/inputproto-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.3.1.ebuild,v 1.2 2015/02/18 15:58:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.3.1.ebuild,v 1.3 2015/02/19 08:54:09 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Input protocol headers"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
 
 RDEPEND=""
diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
index e1d8e7ee88ff..d553986db5e3 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.11.ebuild,v 1.2 2015/02/18 15:58:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.11.ebuild,v 1.3 2015/02/19 08:54:12 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~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=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/x11-proto/xproto/xproto-7.0.27.ebuild b/x11-proto/xproto/xproto-7.0.27.ebuild
index 58a8d2f1419b..67bf70140841 100644
--- a/x11-proto/xproto/xproto-7.0.27.ebuild
+++ b/x11-proto/xproto/xproto-7.0.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.27.ebuild,v 1.2 2015/02/18 15:58:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.27.ebuild,v 1.3 2015/02/19 08:54:14 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org xproto protocol headers"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~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"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
index 1365fb3d36d9..54c2275d8f05 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild,v 1.3 2015/02/11 17:13:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild,v 1.4 2015/02/19 09:02:57 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 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-terms/xterm/xterm-314.ebuild b/x11-terms/xterm/xterm-314.ebuild
index e40620b6b1fc..bddec194bf8e 100644
--- a/x11-terms/xterm/xterm-314.ebuild
+++ b/x11-terms/xterm/xterm-314.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-314.ebuild,v 1.2 2015/02/18 15:58:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-314.ebuild,v 1.3 2015/02/19 08:54:17 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty toolbar truetype unicode Xaw3d"
 
 COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )